Merge "Create $(zip_root)/PVMFW & archive prebuilt used" am: d528b3c5 am:...

Merge "Create $(zip_root)/PVMFW & archive prebuilt used" am: d528b3c5 am: 7520b752 am: 507b4e86

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



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