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

Change-Id: I7d32798b4779127258f9fdfdcea5d8f47759bbb4