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

Change-Id: If5c1489eadbcb6de2ea896978f1bc17279310fe4