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

Change-Id: I5e32c3d8a34acdef48cb42c21c30d07094000d60