fix 'cgroupsockaddr' support am: 2b203138cb am: cb9d56d7f8 am: ef6a079d07

Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1897227

Change-Id: Ic93093c9b16b516b524b2373da5d2dd3e2a5e1a3