Merge "libbinder: __ANDROID_HOST__ => !__ANDROID__" am: 0aee1e883f
am: 65bb4fcab1

Change-Id: I291518ce14f50d249b65bbbda90b599362a4652f