Support incremental OTA in ota_extractor am: 91e839cf19 am: fec3837e1b am: a83d45a9fa am: 68b45aa077

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

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