am 69010219: Merge "Use arch-specific flags."

* commit '69010219a51cd02eeab1229a4f09f61477df2dc2':
  Use arch-specific flags.