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

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



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