Merge "Enable native_bridge_support"
am: 9a45f8ff4c

Change-Id: Ib04ee55d8fa37821b45aa1c28c204cf2594f8f40