Merge "Rewrite cpp-define-generator"
am: 8e7d0cbb8a

Change-Id: I347086087045e0a983b07933a4bb75df725f0c97