Merge "Revert "Revert "libbinder: vendor binder has a different header""" into stage-aosp-master am: b33106b2cf am: f37db00295 am: 41da314c01
am: 453168b476

Change-Id: Ia8d7322860ce3f5b72ec7f8c9df6ca78d4c78740