Merge "Add missing arch-specific AT_ cruft."