Merge "simpleperf: Fix GetModuleBuildId." am: a75aec2642 am: adc55e1139 am: 3603c59e67

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

Change-Id: If319d845a7205517460261146b0d7adddf4c6ee7