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

Change-Id: I00f0be937a06af1ff69de1a6a5b1e83bc6f51c3c