Merge "Revert "Include module dependencies under `data`"" am: fa997797bd am: 64349ebdfc am: 1ae75d0d75 am: 88d5008ead am: 39856e206f

Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2512096

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