Backport "Fix sysroot-tests, adding --print-sysroot" from master