Merge "cpp-define-generator: presubmit hook prints better error message"