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

Change-Id: Id7de3377656c87baedb98f0f2282d01bc77a6b00