am f695a009: ART: Change UnresolvedMergedType internal representation

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