Merge "ART: Change UnresolvedMergedType internal representation"