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

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

Change-Id: If694ce8e40d200f9f75d3646659ca1973e3c12ca