Merge changes from topics "move-avf-jar-to-bcp", "virt-apex-on-system" am:...

Merge changes from topics "move-avf-jar-to-bcp", "virt-apex-on-system" am: 05cc591f am: d629795e

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



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