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

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

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