Merge changes Ie93845ba,If997c068 into main

* changes:
  simpleperf: inject: Add output format for bolt
  simpleperf: Fix dumping build ids when recording ETM data