Merge changes from topic 'multinetwork_vndk' into oc-dev

am: cffee96a16

Change-Id: I91cac262cdb6af6e441c4750636ec28a97f2ad1a

native/android/Android.bp

@@ -87,3 +87,10 @@ cc_library_shared {
 
     include_dirs: ["bionic/libc/dns/include"],
 }
+
+llndk_library {
+    name: "libandroid_net",
+    export_include_dirs: ["include"],
+    symbol_file: "libandroid_net.map.txt",
+    unversioned: true,
+}

native/android/include/multinetwork.h

@@ -0,0 +1 @@
+../../../../native/include/android/multinetwork.h

native/android/libandroid_net.map.txt

@@ -0,0 +1,10 @@
+# These functions have been part of the NDK since API 24.
+# They are also all available to vendor code.
+LIBANDROID_NET {
+  global:
+    android_setsocknetwork; # vndk
+    android_setprocnetwork; # vndk
+    android_getaddrinfofornetwork; # vndk
+  local:
+    *;
+};