Merge "libbinder: vendor binder has a different header" into stage-aosp-master am: 3ccd1b65c8
am: 4a43a522ef

Change-Id: I698899d484d359cb47569c74b9ba2c6ea6e19a7f