Merge "Revert "Remove obsolete java compilation artifacts"" into main am: 14a9a703 am: 73b0456a

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



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