Merge "ART: Allow array-ness for unresolved merge types" am: 0a4d6b9
am: 2900387

* commit '290038734d721c8dab27530f2125890de3b2874b':
  ART: Allow array-ness for unresolved merge types