Merge "simpleperf: fix CHECK_SIZE_U64" am: 38a7812010 am: 29b088a70c am: d133f0f60c

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2338399

Change-Id: I44e4c5727536e95edba4bd14a0b4cc1353646963
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>