Revert "Refactor imgdiag in preparation for ArtMethod"

This reverts commit 0627be3a7b9e4afe0092fa426699e899fc95059a.

Change-Id: Idd36cfe31b2ae4cdf8e0cd2a35b17dca14cec237
1 file changed