Merge "Use mangled name as unique id for C structs as well."