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

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



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