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

Change-Id: I4442a460d372eed07d4d7b74cd449d85fb03bbc0