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

Change-Id: I65507e6a1c01844e7b52983f26a595f76ad6365b