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: e1d6a532

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



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