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

Change-Id: Id2f2a9272a9df5c74c11cbc224e57c294b21717c