Merge "libbinder: on host" am: a8cb8d7624
am: 240e58191c

Change-Id: Iee9da5f39a3dfca42f65a925c6741bd4cf456ccb