Merge "Revert "Include module dependencies under `data`"" am: c638a7588d am: 489a784794 am: 4c8c6529f7

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

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