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: 04fe445a

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



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