Merge "Fixes to build against new VIXL interface."