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

Change-Id: I2f06141c58d7669cf90eb8b3a217dbee82cf2f41