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

* commit '236b3eb6a085bd0762849b5feca880f6dc63787d':
  Use CPPFLAGS instead of CFLAGS.