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

Change-Id: I0a795a55a31b72b637225b114cb0503cffa4bbfa