Fix bad import graph from opts/opts.go Upstream-commit: d85e83960b4aa77e8cf59dd1eabac1884359575f Component: engine