Update build setup for run-support project

Forward port of #3729.