tree 0a7b7ef1b2af8a7a9c65ccdc1c89638933ddd121
parent 55ec62a0a096ddc339e1a40a64c21306bc2a0442
parent 5354fb5465279cd27323995fddd0e0aa928507bb
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582186355 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582186355 +0000

Fix argv handling am: b341a3bbf9 am: 209b582597 am: 5354fb5465

Change-Id: I4527ee961924132011cc05531ec3aa15e7529e72