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

Change-Id: Ic4fd51c924e7046395cacc7776422c0c185ce9cf