Merge "simpleperf: merge dumped symbols with symbols read from file system."