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

Change-Id: I9135de5cbda05c9b4b686b0c6dda26c2d561d31e