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

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

Change-Id: I36f0a8b7f209aeac9dea469cb9589e286b5e92b1