Merge "Add define needed by new vixl"