Merge "Use IBase instead of IBinder for IServiceManager." am: 8ead2f0c9a am: dab9e7bfc7
am: bc9c711513

Change-Id: I6047e1d936ef515d531a8ad4b875ab443ff2f50d