[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 am: b171af2d -s ours

am skip reason: Change-Id I683fe1d7e17f7abaab40206770d09db705493ffb with SHA-1 5e07d0cc is in history

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

Change-Id: I6219b6ae838710bf68d346d29a8c6fe520fd9a23