Merge "Revert "Switch x86 and x86_64 to 4.9. Attempt #2.""