Revert "ART: Fix some performance-X tidy"

This reverts commit 89de444350fdbd7df4fb4d95bb71f00e6673b466.

Reason for revert: Seemingly breaks imgdiag_test on device.

Change-Id: I46084ecb4205575381aafffd90a0f1a1126e8d2d
Test: mmma art
14 files changed