Update emptyfs support to work properly if scratch is already an image Upstream-commit: bb4025c4e206cf46de3ba3267efb3df96db45b91 Component: engine