am 2cfdabd2: Merge "Fix run-test with JIT enabled"

* commit '2cfdabd2bb4833d7092819d27ef08a9e1cdffead':
  Fix run-test with JIT enabled