Merge "Make non-ab code path compatible with extracted target files" into main...

Merge "Make non-ab code path compatible with extracted target files" into main am: 61f81a68 am: 3947fa09 am: 240fe5f9

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



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