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

Change-Id: I71ee7c732b59d566b954efa35341bdb2fd14e8ba