am f2a23a94: am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS."

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