Merge "ARM: VIXL32: Fix some test failures."
am: 07e6a7947f

Change-Id: I58b8126bcb7fa128edc4a726f955157d4c6c6036