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

Change-Id: I05628e684c781d237e5274b0456a2a8281b96c54