Merge "libbinder: Add setDefaultServiceManager for use in host testing." am: fde696396d am: 724335c562

Change-Id: If8c912f25142710c5b49f7a6d94adcd7df80b689