Merge "Show ArtMethods in imgdiag"
am: 34dc841b64

Change-Id: I4694023179bf45361f6a671e2e78aa2259984edc