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 am: 35db1e33

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



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