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

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



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