Merge "Add binder TEST_MAPPING files."
am: a18cfb64c9

Change-Id: I2aa698c76ef5343c7e5bc41298e6894f2880e581