Merge "Revert "Use the NDK cpufeatures directly."" am: 381529dfa1 am: c3ea5ecea2
am: 6675284fc8

* commit '6675284fc8e95732baf9c752c85cf34630fa011e':
  Revert "Use the NDK cpufeatures directly."

Change-Id: I4cb87533fd419b80355a8c70d0264510feb22e85