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

Change-Id: Ie764ae398e0e73da104303f1ea7c9c21256cea5a