[automerger skipped] cc: fix a utility to make C macro name am: 89124ba3 -s...
[automerger skipped] cc: fix a utility to make C macro name am: 89124ba3 -s ours am: 6bc89aae -s ours am: 2dc801a2 -s ours
am skip reason: Change-Id Ifce07547ccc067f1ee5bd8467c2fb7d7f8387b8e with SHA-1 89124ba3 is in history
Change-Id: Id46f081210b3b67cfc5c2add571ad790eb174849