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

Change-Id: If5bf35ad8fd29c3cec6ecb9b9cb882fa86647053