Merge RP1A.200221.003

Change-Id: Ib8c2b919883e71bc88955b2a16e559e6aa4dced2
diff --git a/android/launcher_main.cpp b/android/launcher_main.cpp
index cdf3bd1..eb12871 100644
--- a/android/launcher_main.cpp
+++ b/android/launcher_main.cpp
@@ -130,6 +130,9 @@
 
   config.write_bytecode = 0;
 
+  // We've already parsed argv in PyConfig_Read
+  config.parse_argv = 0;
+
   status = Py_InitializeFromConfig(&config);
   if (PyStatus_Exception(status)) {
     goto fail;