am 9226f8fc: am 07aa4c1f: am a45223b6: Merge "Revert "Switch x86 and x86_64 to 4.9. Attempt #2.""

* commit '9226f8fc3be69d6c3ba9ea583aa36845e91eb7e4':
  Revert "Switch x86 and x86_64 to 4.9. Attempt #2."