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

Change-Id: I92d61ad28033ac5d3c037fd86f4b45589c289ad9