Merge "AIDL it! IServiceManager" into stage-aosp-master am: 1c373c4361 am: 42762e7b4f
am: cdc0b2d3cd

Change-Id: Idf4e7d01aa70e70170fd44b42763518e3939e4ec