Merge "simpleperf: Fix reading old branch list files" into main