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

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

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