Merge "simpleperf: change interface of read_apk.h." am: a38d3af60c
am: 1ca2ac3c78

Change-Id: I2dafec037ff9b4e51c130a7b1c0a1f451fdf4928