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

Change-Id: Ib1abcd696eb043072bacfd74aefae8951586f866