Merge "simpleperf: inject: Fix condition for using branch_addr" into main