Merge "msm8996: Remove support for socket ioctl"