Merge "libbinder: on host" am: a8cb8d7624 am: 240e58191c am: 07bc79d333
am: 68ff4b6e91

Change-Id: I2ab4aea327a0ecd8840699fe68c4fd2df9ff2a4c