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

Change-Id: I09f309e7868b551d5dd2d483a30e41395020fa1b