Merge "Make libhardware_headers available for native_bridge"