Merge "simpleperf: Clean up warnings during recording" am: c759ef2c8c am: ee78a79755

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

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