Merge "Include module dependencies under `data`" am: 1216a70f04 am: f3519ad420 am: 6cda1479e8 am: e179dffb2d am: 377e5a5933

Original change: https://android-review.googlesource.com/c/platform/tools/test/graphicsbenchmark/+/2486735

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