Merge "Switch x86_64 to gcc-4.8"