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