Merge "Include device/generic/goldfish/tasks/emu_img_zip.mk so...

Merge "Include device/generic/goldfish/tasks/emu_img_zip.mk so device/generic/goldfish/Android.mk can be removed" into main am: ecdddc1d am: fccdd06c

Original change: https://android-review.googlesource.com/c/platform/build/+/3534041



Change-Id: I8c0f74e71e7cf396be1c08a68ae29fee9712f9d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>