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

* commit '541b6c1458d0baf598d97b746ec5cca4b7b1df10':
  Update TARGET_ARCH guards to allow x86.