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