Merge "Revert "Refactor imgdiag in preparation for ArtMethod""