Merge "simpleperf: fix two tests in test.py." am: 46d1f0b9ab
am: 5d76b0b7a4

Change-Id: I033314f593cfd2bc89c24dec42070b92ba7bf089