Merge "Revert^2 "Make the target_files zip reflect the recent partition...

Merge "Revert^2 "Make the target_files zip reflect the recent partition change"" into main am: 00bf14b0 am: a2cd1601 am: c8d832ea am: 592678fd am: bb15f84a

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



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