Merge "Refactor imgdiag in preparation for ArtMethod"