Merge "Rebuild and copy recovery and boot img when using vendor_otatools" am:...

Merge "Rebuild and copy recovery and boot img when using vendor_otatools" am: 71585eae am: 7ee275cb

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



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