Merge "Remove obsolete java version environment variables" into main am: f2c51919 am: d72155f0

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



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