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

* commit '810ef3768021b5fc7b47e663e037e49c46f8c916':
  ART: Fix RegTypeCache::FromUnresolvedMerge().