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

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



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