Merge "Revert "Build cache.img.""