am c2e91625: (-s ours) am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS."

* commit 'c2e91625a7333ae993bab4c7069f25c2e9ecc8d3':