Merge "simpleperf: Add needed testdata in artifacts." am: 7a7b47c665 am: 9a5e27ee52
am: 0566028965

Change-Id: I5bdf68343fbefe2aca35aad4515501e3af84b64a