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

Change-Id: Ic3d4824d344922c9cf423d900e51664dd84c7f73