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

Change-Id: I29e0b6276239da96c0ab0f57c8b0841d079f2316