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

Merge "Zip apex system server and standalone system server jars into system_server.zip." am: 4fbebb6d am: a8c84ad5

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



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