am cb1a4ed6: Merge "Use NDK libraries for x86 and MIPS build."

* commit 'cb1a4ed6718df32063e7877903a484f8e38877f7':
  Use NDK libraries for x86 and MIPS build.