Merge "Remove setsockoptGroupSourceReq and StructGroupSourceReq" am: 0d73c15fb7 am: fae9e5c68f
am: 480262f535

Change-Id: Ic292e5184aedc3ed017e5763fc68cd086116368d