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

Change-Id: Ia7d016ea321ff7dfde9583cadf346a7fcb60c3e8