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 am: b11094da am: f8caf4a4

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



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