Merge "clatd: use offsetof" am: b8c834410e am: 1688830b72

Original change: https://android-review.googlesource.com/c/platform/external/android-clat/+/2491938

Change-Id: I01399c72db0105396c32d408e96f1ee2e1ed05b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>