Merge "simpleperf: fix a segfault caused by CloseEventFiles." am: 36ba9c0a85 am: c675d90a82

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

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