Merge "simpleperf: fix two errors."
am: 9baf7c33bb

Change-Id: Iaaef78effbbbacbdb6f7d764f998f1681289b0da