Merge "Cleanup the cpp-define-generator definitions."
am: 231a9538fc

Change-Id: I30440aeb2c7f5c04718f73dfcadd7472e2f0011a