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 am: 1296253d

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



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