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

Change-Id: Ic8af14244c8439a892a4c4b4bdc0ebbff89b13a3