Merge "Fix test in case we run the ART_TEST_TRACE tests." am: b178e11d9e
am: 4c08c8822b

* commit '4c08c8822bffdd898a9c1dee3dfba72767821f0b':
  Fix test in case we run the ART_TEST_TRACE tests.