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