Merge "Remove unused timeout args for _makeBuilderTask"