Merge "servicemanager: TEST_MAPPING += libbinder tests" into stage-aosp-master
am: d2fe5c5dc0

Change-Id: I1578e24075e693f9467511d40e2cd8bb78516e5f