Merge "Fix includes for arch_test.cc."