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

* commit '0a4d6b9faaaa2652c42679df2a72c78485ed9c64':
  ART: Allow array-ness for unresolved merge types