[automerger skipped] cc: fix a utility to make C macro name am: 89124ba3 am:...
[automerger skipped] cc: fix a utility to make C macro name am: 89124ba3 am: 4a4d8120 am: 4c9dfabf am: 36884a6d -s ours
am skip reason: Change-Id Ifce07547ccc067f1ee5bd8467c2fb7d7f8387b8e with SHA-1 89124ba3 is in history
Change-Id: I3310c6467cdcfba8f4f4790d23600215e6ede68b