Merge "Remove unused libraries" am: e4848734a9

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

Change-Id: I94d1fa0167c143478938342f6d4d41e7a6bdf894