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

Change-Id: I8c39d01e0670d200c18ba02dbd3d09cea5a503c7