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

Change-Id: Iae08221fa292cc654de37599102925851b845554