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

Change-Id: I40205d0cd36c8a3a0b253589434075b4bbbf6c11