am f0cdebde: am 081da0ad: Merge "ART: Change UnresolvedMergedType internal representation"

* commit 'f0cdebde0b0563758ce8bc27b8984a2623e50fd1':
  ART: Change UnresolvedMergedType internal representation