am 0cadcc4b: am 3bcac48f: Merge "ART: Fix run-test 114 ParallelGC to account for OOM"

* commit '0cadcc4b53f260e4e0e2a2ef0c8f4e668a9c1a18':
  ART: Fix run-test 114 ParallelGC to account for OOM