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

* commit '3d4127a6bc4e8575b30a612216062cf6045f4500':
  Revert "Update TARGET_ARCH guards to allow x86."