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

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

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