Merge "Update TARGET_ARCH guards to allow x86."