am bf0b6df4: Merge "Switch x86 and x86_64 build to use GCC 4.9"

* commit 'bf0b6df4c15c2e7bbfd3a8b84d7c627cc3b7127f':
  Switch x86 and x86_64 build to use GCC 4.9