Merge "Revert^2 "Remove obsolete java compilation artifacts"" into main am:...

Merge "Revert^2 "Remove obsolete java compilation artifacts"" into main am: 291bcf4f am: 6e3350db

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



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