Merge "Revert "Include module dependencies under `data`"" am: fa997797bd am: 64349ebdfc am: 1ae75d0d75 am: 88d5008ead Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2512096 Change-Id: Ia98a503e53e421ebdbf947d51014954a6c551214 Signed-off-by: Automerger Merge Worker <[email protected]>