Merge "Use U32 from shared library" am: 98502b78bc am: 259e42efc3 am: afc5230d69

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

Change-Id: I66afe5d0994264e3055050f00971f534afab9dfe