Merge "cpp-define-generator: presubmit hook prints better error message" am: 4caf203983 am: e81fdaba26
am: 5fed2430c8

Change-Id: I36e2e64aa7206cc303cc87288fd528d2c15287fd