Merge "Use CPPFLAGS instead of CFLAGS."