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

Change-Id: I679503b786735669c44f2769d4997c6d0f1876dc