Merge "Update deapexer extract call with more input" am: 1c1a0750

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



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