Merge "Fix a typo in my_cppflags assignment."