GitLab

Back-port from AOSP master tree.

This patch depends on https://review.source.android.com/24052

It is used to ensure that the proper kernel image is copied to the
platform image's kernel-qemu.

This is needed because for ARMv7 platform builds, the image is
in prebuilt/android-arm/kernel/kernel-qemu-armv7, instead of
   prebuilt/android-arm/kernel/kernel-qemu

Change-Id: I1d79c2ac9711472be1832605bb27bdce7b09344c
Orig-Changed-Id: f7f6842b