Merge "Fix test data to use my_test_data_file_pairs" into main am: faa072b9...

Merge "Fix test data to use my_test_data_file_pairs" into main am: faa072b9 am: 691e2d57 am: 876245df

Original change: https://android-review.googlesource.com/c/platform/build/+/2842097



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