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

Change-Id: I3d72c2338d0ad627ef1a1a639c3cc0700e2302fe