Merge "Revert^2 "Remove (host) x86_64-linux gcc-4.8 bins""