Merge changes from topic "libbinder_ndk_aidl"
am: 8cdc1d07fe

Change-Id: I88ba3415130652d7338b4bc6ac5b594fed7beb6d