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

* commit '5a8f70678b17e8628abcac8fc7c3b31ebd4dffc3':
  Switch x86 and x86_64 to 4.9. Attempt #2.