Cleanup invalid code in overlay2 and layer store Upstream-commit: 1f4137857f6eb8edcbefe591e1abe04d83da3416 Component: engine