Merge "libbinder_ndk: host available" am: 83a23e7fb0
am: e4bfcf8f74

Change-Id: Iff65f977854d48118f4ddf72d976f688accc7ed8