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