Merge "Move libnativebridge headers into the module." am: 508e0b8b34
am: 1921ab7c0e

Change-Id: Ia1e83633a2b28a7fc15f96aaca31b57fcd183c3f