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

Change-Id: I2c9b3b98e5634a59c7ba9eb9365c03217a5ddc91