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

Change-Id: I51ab527287464759590b3e1f21c4d3692ef364e6