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

Change-Id: I4a2d9dfebdcbb0880ec3f53c2c28039da60b086d