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

Change-Id: I93d9d4a8e419f82cccc119a9fa5b6744fb8481a3