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

Change-Id: Ifb3e84ed0a059f10efe8e25595387a17c2b0ed46