Use ImageBuildOptions in builder. Upstream-commit: acfd5eb947bff31239701e754814787e92e1d17f Component: engine