Merge "Upgrade elfutils to 31c8b3f098b0654db8f573b2a15d5b6d07d4d3b0"