Merge "Fix *tests-run-on-host target"