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 am: 6ab82787

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



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