Merge "Enable native_bridge_support" am: 9a45f8ff4c
am: afc369a469

Change-Id: I2c6d555da8f4092a44f7fb1fb30745871b5c5fbf