Merge "Rewrite test data logic to make it faster" am: 83e9cfe2 am:...

Merge "Rewrite test data logic to make it faster" am: 83e9cfe2 am: 84849aef am: b17e2f50 am: 7f82a0ca am: 23d1c73f

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

Change-Id: I9a650e8d6e0a0ebf7e1bd051d75e97a4644bda20