This reverts commit 6856214f. Fix lifetime issue in imgdiag. Test: mmma art Test: m test-art-target-gtest-imgdiag_test Change-Id: I919db6310c0713313340adfe66bcd75a1c5c236e