Merge "Fix runtest build step."