Merge "simpleperf: fix 32-bit simpleperf_unit_test." am: 12b04e5e17
am: ab1c67e5e7

Change-Id: I91d3e4e12c956e533509f3cf02db63e891a45637