Merge "Fix memory leak in OTA verifier code" am: 65162cd9b0 am: efc4279944 am: 6e0b7fa5ec

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2106828

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