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

* commit '8081a8b5960055c12ad50ba9a8651fe3adb4b370':
  Revert "Switch x86 and x86_64 build to use GCC 4.9"