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

Change-Id: I0036c59e558f6eeb64c476e7b2b11ce5bd64ef1b