Merge changes from topic "libbinder-bitness-header" into stage-aosp-master
am: baa900adda

Change-Id: I94bc65d02b992270e67e5c25a45df1e9496891f0