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

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

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