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

Change-Id: I656704d777e1886312d8837dcfa406bae5a2596c