Snap for 6224746 from de73b7ba33a73ae5cba35a3be7809153b030e91d to rvc-d1-release

Change-Id: I6e333a532d837e38fa1d72c49f0775e7ee5ded1e

android/launcher_main.cpp

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;