Merge "Fix dexdiag start end address" am: ef6787bd89 am: 1603ffc5ad am: 2f59d552b0
am: a449eb6874

Change-Id: Ic79db99f77d0d8e28ae062d1dab1e184d13f1884