Merge "simpleperf: fix symbolization in multi-executable-segments libraries." am: 66d0149f5e
am: fbf98e1bf1

Change-Id: Iaeead5f6d7e876ab1518c42fa38fed57128c740c