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

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

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



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