meta-agl-bsp: Re-merge image-vm/image.bbclass overlays

meta-agl-bsp: Re-merge image-vm/image.bbclass overlays

As part of the pyro merge we need to continue to overlay these classes
in order to support vmdk.xz.  While upstream has some of the underlying
required changes, we had dropped 'vmdk' as a standalone image type and
now have 'wic.vmdk' there.  This was too invasive for pyro however.
This in turn means that we carry vmdk.xz support here.

Another part of this is that in some places we were checking only for
the string vmdk but also need to check for the string vmdk.xz as well.
Update these locations to use bb.utils.contains_any so that we can catch
both easily.

Bug-AGL: SPEC-899, SPEC-775, SPEC-776
Change-Id: I0cc3c06d59c97c0a76819209e313bc6f5495cc31
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/11153
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>