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

Change-Id: I1d09f2658cf698423cbe91d3e5cfa87e07c4cd57