Merge "simpleperf: fix unit test." am: bee9bac65f am: 2984594cf2
am: fa7b44fd49

Change-Id: I79ba152bcc962488c3ce8cc3ff744747d71f597f