Merge "Fix Soong code, remove dead code, and clean up code for Java fuzz" am: ad8cc47e

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



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