Merge "Use arch-specific variables"