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: 4911a79078

Change-Id: I014c4947e1fe3a2902598ffcff0d35d0f0be5de1