Merge "NdkBinderTest: enable instant_app + multi_abi" am: 879d4e2aa8
am: 48a7cef205

Change-Id: I2f0091ba4c00e328d2de9a642ec1981f54361659