Merge "Revert "Revert "Refactor imgdiag in preparation for ArtMethod"""
am: 7506c70e2e

Change-Id: I23b8ac3bb8a594c327803673c224c66e9510e131