am f24576a7: Merge "ART: Change UnresolvedMergedType merge"

* commit 'f24576a7233ec708d49badb239cd7336c2b0f07e':
  ART: Change UnresolvedMergedType merge