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

* commit '85a77d2abef598099b1f64b9efd1af481f2f62fd':