Merge "Revert "simpleperf: update testdata used for testing reading dex files.""