Merge "Revert "Refactor imgdiag in preparation for ArtMethod"" am: 2603bcd380 am: 96a7338649 am: 0b64e94baf
am: 2dda1aca2a

Change-Id: I43ee21fa489e9ffdf9986c6f6351c287f7c0f15b