Merge "Rewrite cpp-define-generator"