am 7dcbc563: Merge "Fix a typo in my_cppflags assignment."

* commit '7dcbc563f8811259809b754d0c0edc717e1476e6':
  Fix a typo in my_cppflags assignment.