Merge "simpleperf: fix linux host test." am: 9a03bc3b27 am: d9abb0c3a3 am: 4c9ed6914f

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

Change-Id: Ic7d0d92a62ca497f9e68a96cb676b93eadfa9fce