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

Change-Id: I7822043a7795a78e8003f123bd32f61c975d3fdb