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

Change-Id: I4809f4e755969993935df793d76f1caa7bcc4418