Merge "Support arch-specific LOCAL_ variables"