Merge "Revert "Revert "goldfish: speed up system-qemu.img packaging"""