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

Merge "Revert "Include module dependencies under `data`"" am: 546accf2 am: 1687f330 am: ff207d42 am: ed2a0bee am: f4f0ce71

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



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