Merge "Revert^2 "ART: Fix some performance-X tidy""
am: 5774f57afc

Change-Id: Id20aa8a8db2306cc0610369356b4577d98da18f8