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

Change-Id: Ide910c7049f75a9ae48671007685dcd5c52c7007