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

Change-Id: Ia92f61b0d78d5b10b99f7330f96ebf1eeb59ae24