Merge "ART: Fix breaking changes from recent VIXL update."
am: 12568e0279

Change-Id: Ib0bcf0b03b84717cdfecc94203bc83eda5d12b76