Snap for 9094779 from f663ba3e720a536eda74bc389f6612dd6415d15e to udc-release

Change-Id: Ib4108e8ef4a438f72e1bb6bb9c7f9c309fb42bec
diff --git a/Android.bp b/Android.bp
index c77abc6..4cb6d72 100644
--- a/Android.bp
+++ b/Android.bp
@@ -57,12 +57,6 @@
 }
 
 filegroup {
-    name: "py2_httplib2_srcs",
-    srcs: ["python2/httplib2/*.py"],
-    path: "python2/httplib2",
-}
-
-filegroup {
     name: "py3_httplib2_srcs",
     srcs: ["python3/httplib2/*.py"],
     path: "python3/httplib2",
@@ -73,14 +67,5 @@
     host_supported: true,
     data: [":cacert_data"],
     pkg_path: "httplib2",
-    version: {
-          py2: {
-              enabled: true,
-              srcs: [":py2_httplib2_srcs"],
-          },
-          py3: {
-              enabled: true,
-              srcs: [":py3_httplib2_srcs"],
-          },
-    },
+    srcs: [":py3_httplib2_srcs"],
 }