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

Merge "Revert^3 "Make the target_files zip reflect the recent partition change"" into main am: 985332ea am: 1c1740fa am: 2dcd7616 am: 2971f1e5 am: 62188e25

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



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