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

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

Change-Id: I03c968c61ac0be1695dc86df9cd21dc7942e3526