Merge changes from topic "libbinder_ndk_aidl" am: 8cdc1d07fe am: 6f84b30383
am: 2a9943bb17

Change-Id: I5fd3ac2202eec9f77ce03af72f7cf12d1528c6a1