Snap for 6183524 from 6f33085b3897ad09cabbb27c7768b7fdd7ec9752 to r-keystone-qcom-release

Change-Id: Ic43002b350d34dd554e7261e5043757197da2e52
diff --git a/Android.bp b/Android.bp
index a43b89d..7449c17 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,7 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-build = ["Android-bionic.bp", "Android-linux_x86_64.bp", "Android-darwin_x86_64.bp"]
+build = [
+    "Android-bionic.bp",
+    "Android-linux_x86_64.bp",
+    "Android-darwin_x86_64.bp",
+]
 
 cc_defaults {
     name: "py3-interp-defaults",
@@ -266,7 +270,10 @@
             ],
         },
         host: {
-            static_libs: ["libsqlite"],
+            static_libs: [
+                "libsqlite",
+                "liblog",
+            ],
         },
         android: {
             shared_libs: [
@@ -310,7 +317,7 @@
         darwin: {
             srcs: ["android/darwin_x86_64/config.c"],
         },
-    }
+    },
 }
 
 cc_binary {
@@ -364,5 +371,5 @@
         darwin: {
             srcs: [":py3-c-modules-darwin_x86_64"],
         },
-    }
+    },
 }
diff --git a/Lib/Android.bp b/Lib/Android.bp
index cd43f1d..e744fac 100644
--- a/Lib/Android.bp
+++ b/Lib/Android.bp
@@ -18,13 +18,15 @@
     pkg_path: "stdlib",
     srcs: [
         "*.py",
+        "asyncio/**/*.py",
         "collections/**/*.py",
-        "compiler/**/*.py",
+        "concurrent/**/*.py",
         "ctypes/**/*.py",
         "distutils/**/*.py",
         "email/**/*.py",
         "encodings/**/*.py",
-        "hotshot/**/*.py",
+        "html/**/*.py",
+        "http/**/*.py",
         "importlib/**/*.py",
         "json/**/*.py",
         "logging/**/*.py",
@@ -32,8 +34,10 @@
         "pydoc_data/**/*.py",
         "sqlite3/**/*.py",
         "unittest/**/*.py",
+        "urllib/**/*.py",
         "wsgiref/**/*.py",
         "xml/**/*.py",
+        "xmlrpc/**/*.py",
     ],
     exclude_srcs: [
         "__phello__.foo.py",