Merge "Revert "Include module dependencies under `data`"" am: 546accf2a3 am: 1687f3304e am: ff207d42d2

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

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