Merge "Remove unused libraries" am: e4848734a9 am: fb73190bd6

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

Change-Id: I31307ee5d3496fb3473ecb68a5e6506e45b6075d