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

Change-Id: Icc1c40db1d8971a4ba6068c6e6e16a50d5a4cacb