am 168387df: ART: Change UnresolvedMergedType merge

* commit '168387df8dcbae1b51f124eed84daf8e8de6a974':
  ART: Change UnresolvedMergedType merge