Merge "Revert "Include module dependencies under `data`"" am: c638a758 am:...

Merge "Revert "Include module dependencies under `data`"" am: c638a758 am: 489a7847 am: 4c8c6529 am: 959b7984 am: 5d53b99c

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2512135



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