Merge "Use mangled name as unique id for C structs as well."
am: 6456b0bfc9

Change-Id: I2c07a0b65c45d484e459721fd1061b3a184d6052