am c5f5daff: am 719b8423: Merge "Remove ARCH_X86."

* commit 'c5f5daffb520017f2d6d99d245866b448723c876':
  Remove ARCH_X86.