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

Change-Id: Ib99eedcbbade1ddb6256481c8c15eee44acb1956