Merge "Revert "Revert "libbinder: vendor binder has a different header""" into stage-aosp-master
am: b33106b2cf

Change-Id: Ia484104359f995a2be9df16fb6c768bbc554c2ae