am 6ea04067: Merge "Revert "Update TARGET_ARCH guards to allow x86.""

* commit '6ea0406747f76d909701053722fd44bc673826c3':
  Revert "Update TARGET_ARCH guards to allow x86."