Merge "Allow drmserver to unlink old socket file."