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

* commit '182418d2f13d0faf1317ecac38440ecf278b55b7':
  Use arch-specific flags.