Merge "simpleperf: fix reading symbols from multidex apk." am: 60e0f8d775 am: d45330b997
am: 837cb4a94e

Change-Id: Ia255056d47089261174b7033362127d716187ed4