am 335b1918: am 5a8f7067: am e9b15e2c: Merge "Switch x86 and x86_64 to 4.9. Attempt #2."

* commit '335b19180077bd56ae5db605a92f0034c25f679e':
  Switch x86 and x86_64 to 4.9. Attempt #2.