Revert^2 "ART: Fix some performance-X tidy"

This reverts commit 6856214f2c849600bcb94cc6e84975ba8cb69920.

Fix lifetime issue in imgdiag.

Test: mmma art
Test: m test-art-target-gtest-imgdiag_test
Change-Id: I919db6310c0713313340adfe66bcd75a1c5c236e
14 files changed