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

* commit '55e8c113afc9d52d2142de72a4eebfc2c5a9ef05':
  generic_x86: build using the NDK ABI's processor features