Merge "Revert "ART: Fix some performance-X tidy""
am: 35d4b9410c

Change-Id: I2a1b5398cc8cc33c50911dd712a332c46dab3cd3