Merge \"Change to include linux/android/binder.h.\"
am: b34400ea94

Change-Id: I1aab76bd51c448410d1d9ff3ae288013c81c8d52