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 am: 361d28eb am: 5dd81338

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



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