Merge "simpleperf: fix test.py to pass on non-rooted devices."