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

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