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: I11f45d6530e8a3495a2de70dfc87d65d212b1b95