Merge "simpleperf: fix python test." am: 3f90838474

Change-Id: Ib3890089ef9639cf9b640fd9253e026ab42efddb