Merge "Revert "goldfish: cache image is not ext4. yet.""