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

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

Change-Id: I7528dae94801d7cddee03595d2b76904fa8afed3