Merge "Rewrite test data logic to make it faster" am: 83e9cfe291 am: 84849aef8e am: b17e2f5004

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

Change-Id: Ic7c0ba13df561059e85feae83d7c56c9f20fb74c