Merge changes Ia8b678ab,I823201e3

* changes:
  ART: Move FillHeap to CommonRuntimeTest
  ART: Account for OOME during array merging