Merge "Revert^2 "ART: Fix breaking changes from recent VIXL update.""