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

* commit '0877965170498b2dd3a58f9483cf26d6945c9138':
  generic_x86: build using the NDK ABI's processor features