Merge "Remove obsolete helpers from CompilerDriver."