Merge "ART: Fix RegTypeCache::FromUnresolvedMerge()." am: 810ef37680
am: 39c5d595cd

* commit '39c5d595cd50441e666e5ab0a4af86bdcb46c616':
  ART: Fix RegTypeCache::FromUnresolvedMerge().