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

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