Fix golint warnings for builder Upstream-commit: a751c0a52fa5c845631db8de285f4c0a809580bb Component: engine