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

Change-Id: I56a37a57647693918f625c465b362797bbdb0d81