Merge "Fix dexdiag start end address"
am: ef6787bd89

Change-Id: I18e9074dab5907c4eec19a8c7198095a9fd62560