Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master
am: b3c418e847

Change-Id: Ie9fa17a1f77b03687e626754291b6997856183ce