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

Change-Id: Ifa8a631c7b28d498f515e1af0d0c36653a8275ff