Merge "Revert "Revert "goldfish: speed up system-qemu.img packaging""" am: d750affff3 am: e0c60f4c69
am: 4305aa5504

Change-Id: Ic58853e6e47a50ed7e34e296dd6482818da7d9fd