Merge "simpleperf: inject: Fix address conversion for bolt output" into main