Merge "Support compiling run-tests with jack"