Merge "Revert "Revert "Refactor imgdiag in preparation for ArtMethod""" am: 7506c70e2e am: 69790f7386 am: bfb16f30c2
am: 121fc54e1e

Change-Id: Ia3f675f6df4e5ec02d8ea156105229eb2be04b1b