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

Change-Id: I4b97549d48bd3cb802ff96e4118690b8c0b3e81a