cleaning up a few in framework/base/services. Bug: 19913735 Change-Id: I1af5f24d9b39d6712ad3a665effa6166e32ce3d3