Merge "simpleperf: fix two errors."