Merge "Fix the build with respect to new VIXL."