am c7296b6f: Merge "Remove ARCH_X86."

* commit 'c7296b6f100fff7ab21fb1f512e9f230f4cae048':
  Remove ARCH_X86.