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

Change-Id: Ie9cc56ecc55ea9379e89eebaf1b67c7aa05be7ae