Merge "Revert "ART: Fix breaking changes from recent VIXL update.""
am: 89dc5e2fcf

Change-Id: I9992817bef57799510868f986d79abdfbce3dc3d