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

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



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