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

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

Change-Id: I77a3dab4083bf992daa8314490b3c360adfc8abd