Merge "AIDL it! IServiceManager" into stage-aosp-master