Merge "Move socket tagging from libcore."