Merge "libbinder: add aidl_integration_test to test map" am: 554e0d568c am: 4d09e989b2

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1516578

Change-Id: Iedac521583fbb77087e3fd19d923bcac8935bb02