am 3e4732a3: am 08779651: Merge "generic_x86: build using the NDK ABI\'s processor features"

* commit '3e4732a39f63326d267a1af17184556e3977f582':
  generic_x86: build using the NDK ABI's processor features