Merge "Revert "Rebuild vendor images in sign_target_files_apks with vendor...

Merge "Revert "Rebuild vendor images in sign_target_files_apks with vendor otatools."" am: d9c6d5fc am: 497e97a6 am: 641a518d

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

Change-Id: I288a16b78984b7f3c14e2c2b6424ed96892b2b79