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

Change-Id: I5e716a318d6ee57bab85b1b8cd6c9beca1064479