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