Merge "Support local cuttlefish instances with mixed vendor_boot.img" am: eb3c30ec2f am: a589f388b2 am: 1ce4850f6b

Original change: https://android-review.googlesource.com/c/platform/tools/acloud/+/2059349

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