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

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

Change-Id: I507992b0da0a6177ce62c76c31919770d37d9e60