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

Change-Id: Iaa6868863b4af6a404288117fec35e210b2eef53