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

Change-Id: I3878c93ee39b5c83020990aa0e38c9eeb603041e