Merge "Refactor imgdiag in preparation for ArtMethod"
am: 97813fbb4d

Change-Id: I42a07da0aa0498084c4ce377a11b9b376d106683