Merge "Add tagSocket/untagSocket NDK APIs"