Merge "Switch x86 and x86_64 build to use GCC 4.9"