Fix quoting problems from my previous change. <rdar://problem/13001651>

I give up trying to get all of the settings into COMMON_MAKEFLAGS, so just
do the easy thing and repeat the ones with interesting quoting issues
in each make command.