[automerger skipped] Add soong cc and java deps to general-tests dist am:...

[automerger skipped] Add soong cc and java deps to general-tests dist am: 63d68798 -s ours am: 30d98376 -s ours

am skip reason: Change-Id I683fe1d7e17f7abaab40206770d09db705493ffb with SHA-1 63d68798 is in history

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

Change-Id: I2151f674de5696d61f458a4388f11a2e2f5fedff