Merge "Simpleperf: improve symbol parsing."