Fix crash on ota_extractor am: 93e3810b0c am: 4e54b254b0 am: 3a0abd0b47 am: 384dd713d6 am: 2ff0dffdb3

Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/2063610

Change-Id: I46a541850bd623e0c32db3689a0076a2bf31424e
Signed-off-by: Automerger Merge Worker <[email protected]>