Merge "Makefile: don't use $(CC) before value is explicit set" into integration