Merge "Fix linker error with upstream llvm" am: ce11dc9a2d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2133158

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