Merge "simpleperf: Fix GetModuleBuildId." am: a75aec2642

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

Change-Id: Icfac08eb18ad03e33efaf61569218a2a0f0286d8