Merge "Fix running some run-tests with -Xjitthreshold:0"