Merge commit '09c09e77ca51cf11ba949a2c49efee4c385c4a0c' into HEAD

And revert 8bc2d9ca to skip importing openssl lib.

Bug: 133125685
Test: None
Change-Id: Ie299b0acef5e233f74f3403d42d18e691473f8d9
diff --git a/Android.bp b/Android.bp
index 8eb11e9..ef42197 100644
--- a/Android.bp
+++ b/Android.bp
@@ -54,7 +54,6 @@
         "py-dateutil",
         "py-google-api-python-client",
         "py-oauth2client",
-        "py-pyopenssl",
     ],
     dist: {
         targets: ["droidcore"],