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

Change-Id: Ie18ddd998c88c6a73d29fccf3b06125afb822b49