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

Change-Id: I8828fd0a11dd7414d004d9652cc8a38d0eee84a6