am 58b2f1e3: am 81f7dee7: am bf0b6df4: Merge "Switch x86 and x86_64 build to use GCC 4.9"

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