Merge "Remove unused libraries" am: e4848734a9 am: 0e4e270314

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

Change-Id: I547e9c82bff23c426418466cfa85321cbb3717fb