Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master