Merge "Delete the javac/classes directory after zipping it" into main am:...

Merge "Delete the javac/classes directory after zipping it" into main am: 61bf9ef3 am: 4fe3eaee am: d7d745ba

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



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