Merge "Add a 'unique id' for TagDecls for type uniquing."