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

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

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