Merge "Fix runtest --path for tests built against SDK."