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