am 6fb66a2b: Merge "Fix includes for arch_test.cc."

* commit '6fb66a2bc4e1c0b7931101153e58714991237af7':
  Fix includes for arch_test.cc.