am 262d8ae9: am 541b6c14: Merge "Update TARGET_ARCH guards to allow x86."

* commit '262d8ae9398445a8ab03ed4f5f8ba8911f021487':
  Update TARGET_ARCH guards to allow x86.