Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34 am: 1921ab7c0e" into oc-dev-plus-aosp
am: 7f895b1438

Change-Id: I0f323f32a7037c23cee8aa872e282a2e953f5f09