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

Change-Id: I8a2a40312ff480580b417207236ce07021b0d02f