Merge changes from topics "rename-libbpfmapjni", "rename-libtetherutiljni" am: ff81692077 am: 694ecd1c53 am: 0a34b679f4 am: d8594a51fa

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

Change-Id: I4b623e87cbb13b797ea2e029250f0204e426175d