Merge "Add a 'unique id' for TagDecls for type uniquing." am: 01decf25e8 am: 07b966e45a
am: eb393c3f8a

Change-Id: Ib290e63a2c36ec0b92d5dc8777f24bc2585d504d