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

Change-Id: Idab0bd323cb099f292ba972015c9a8ff6f71ef01