am 58350dee: Merge "Don\'t add CFLAGS to CPPFLAGS"

* commit '58350dee77bbfadaea7bce9ee83555dba4963d92':
  Don't add CFLAGS to CPPFLAGS