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

Change-Id: I7b1004e9e59008c5bde485be7cfe605d109c4173