Merge "Revert "Revert "Stop shipping GCC."""