[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 -s ours am: 7f21e7fc -s ours
am skip reason: Change-Id Ifce07547ccc067f1ee5bd8467c2fb7d7f8387b8e with SHA-1 b04a4997 is in history
Change-Id: I6e1a8e9511578dfc92ebbb80cb0a74d46c40e5d1