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

Change-Id: Iad945b5a35d5515d60c1100846843b5b0401113f