Merge "Enable native_bridge_support for cpufeatures" am: 7808edf8a9 am: ba6074c0be am: 302c059c4b
am: d005825ccf

Change-Id: I3689b37f39031b071e9a6a45f032861eabaaf726