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

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