Merge "Use libdexfile external API in simpleperf." am: f8a943e3ee
am: 95d21eb5ff

Change-Id: I1f20d33182b1eab74f2fe2e27ac0ebbd501c749d