Merge "libbinder: add aidl_integration_test to test map"