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

Change-Id: If46abdd808a47446b7abf6edc2749f34cc94abe8