am 534b7341: Merge "Don\'t use stale NDK libraries for IA"

* commit '534b7341a1d4b2972d373e5d5f10452b245a6c50':
  Don't use stale NDK libraries for IA