Merge "Handle OPTIONS requests from SIP servers." into gingerbread