Merge "Force use of compatibility compilers on Apple's command line tools"