Merge "Refactor imgdiag in preparation for ArtMethod" am: 97813fbb4d
am: d41b718361

Change-Id: I82d917a6ba4ffbedb8dd6da51121942817f4c9fc