Merge "simpleperf: Fix dumping build id for system wide etm recording" into main