Merge "Revert "Zip apex system server and standalone system server jars into...

Merge "Revert "Zip apex system server and standalone system server jars into system_server.zip."" am: 4b9babc1 am: 72b21a0a

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



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