am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS."

* commit 'e67104a6a778f70bd479e737b09eb32c835e250e':
  Use CPPFLAGS instead of CFLAGS.