Merge "simpleperf: fix failed python tests on Android O."
am: 5c96779dd0

Change-Id: I353afac69837281b59f241a7e6d0f4b9406cb604