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

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



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