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

Change-Id: I469ccd8b338aaccfa8ea14024cb1497f1841eb50