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

Change-Id: I1698162d5b0b04ed427a3f5e9a7b327c95b7dd77