Merge "Add binder TEST_MAPPING files." am: a18cfb64c9
am: af75deb237

Change-Id: I403408ccf1dd134a5cef13725d67f4635b8a2b68