am 13169ccb: Merge "Revert "Switch x86 and x86_64 build to use GCC 4.9""

* commit '13169ccba2d9e11e311babd8fc80f41c610c753e':
  Revert "Switch x86 and x86_64 build to use GCC 4.9"