Change the way --flagfile is implemented.
Change the way --flagfile is implemented.

I noticed this while testing --split_apk: sometimes APKs would be duplicated on the command line, and simply removing "argv" from "FLAGS(sys.argv + [line.strip()...)" in line 558 would sometimes cause a --adb_arg argument to be lost.

This seems to work for all cases.

--
MOS_MIGRATED_REVID=95715369

wakashige/bazel,bazelbuild/bazel,juhalindfors/bazel-patches,perezd/bazel,whuwxl/bazel,katre/bazel,variac/bazel,mikelalcon/bazel,gavares/bazel,mrdomino/bazel,UrbanCompass/bazel,dropbox/bazel,manashmndl/bazel,Asana/bazel,juhalindfors/bazel-patches,anupcshan/bazel,kamalmarhubi/bazel,variac/bazel,joshua0pang/bazel,JackSullivan/bazel,twitter-forks/bazel,twitter-forks/bazel,dinowernli/bazel,kchodorow/bazel-1,mrdomino/bazel,safarmer/bazel,ulfjack/bazel,murugamsm/bazel,zhexuany/bazel,davidzchen/bazel,Digas29/bazel,damienmg/bazel,davidzchen/bazel,spxtr/bazel,gavares/bazel,kamalmarhubi/bazel,rzagabe/bazel,safarmer/bazel,joshua0pang/bazel,ButterflyNetwork/bazel,charlieaustin/bazel,rzagabe/bazel,sicipio/bazel,akira-baruah/bazel,bazelbuild/bazel,perezd/bazel,manashmndl/bazel,twitter-forks/bazel,akira-baruah/bazel,aehlig/bazel,d/bazel,asarazan/bazel,damienmg/bazel,Ansahmadiba/bazel,Topher-the-Geek/bazel,kchodorow/bazel,wakashige/bazel,mikelalcon/bazel,cushon/bazel,kidaa/bazel,mbrukman/bazel,Digas29/bazel,charlieaustin/bazel,werkt/bazel,xindaya/bazel,sicipio/bazel,manashmndl/bazel,murugamsm/bazel,ButterflyNetwork/bazel,cushon/bazel,juhalindfors/bazel-patches,mikelikespie/bazel,hermione521/bazel,UrbanCompass/bazel,kchodorow/bazel,cushon/bazel,dslomov/bazel,ruo91/bazel,mikelalcon/bazel,nkhuyu/bazel,asarazan/bazel,UrbanCompass/bazel,dslomov/bazel-windows,safarmer/bazel,whuwxl/bazel,hhclam/bazel,ButterflyNetwork/bazel,hhclam/bazel,xindaya/bazel,nkhuyu/bazel,kamalmarhubi/bazel,rohitsaboo/bazel,joshua0pang/bazel,aehlig/bazel,mikelikespie/bazel,cushon/bazel,snnn/bazel,murugamsm/bazel,xindaya/bazel,rhuss/bazel,wakashige/bazel,mbrukman/bazel,abergmeier-dsfishlabs/bazel,dropbox/bazel,vt09/bazel,spxtr/bazel,spxtr/bazel,Digas29/bazel,damienmg/bazel,dhootha/bazel,asarazan/bazel,bazelbuild/bazel,gavares/bazel,rzagabe/bazel,charlieaustin/bazel,dropbox/bazel,dhootha/bazel,vt09/bazel,LuminateWireless/bazel,meteorcloudy/bazel,kchodorow/bazel,rohitsaboo/bazel,bitemyapp/bazel,wakashige/bazel,bitemyapp/bazel,xindaya/bazel,mikelalcon/bazel,akira-baruah/bazel,Asana/bazel,sicipio/bazel,JackSullivan/bazel,bitemyapp/bazel,whuwxl/bazel,kchodorow/bazel,nkhuyu/bazel,zhexuany/bazel,iamthearm/bazel,mikelalcon/bazel,hermione521/bazel,spxtr/bazel,mikelikespie/bazel,snnn/bazel,hermione521/bazel,iamthearm/bazel,katre/bazel,dhootha/bazel,bitemyapp/bazel,ButterflyNetwork/bazel,kidaa/bazel,iamthearm/bazel,anupcshan/bazel,juhalindfors/bazel-patches,rohitsaboo/bazel,ruo91/bazel,murugamsm/bazel,vt09/bazel,hermione521/bazel,LuminateWireless/bazel,mbrukman/bazel,snnn/bazel,cushon/bazel,bazelbuild/bazel,dslomov/bazel-windows,dslomov/bazel,wakashige/bazel,twitter-forks/bazel,anupcshan/bazel,hermione521/bazel,Krasnyanskiy/bazel,hhclam/bazel,asarazan/bazel,aehlig/bazel,dropbox/bazel,davidzchen/bazel,ruo91/bazel,nkhuyu/bazel,rhuss/bazel,mbrukman/bazel,Topher-the-Geek/bazel,spxtr/bazel,d/bazel,gavares/bazel,variac/bazel,rohitsaboo/bazel,kchodorow/bazel-1,dinowernli/bazel,LuminateWireless/bazel,dslomov/bazel-windows,aehlig/bazel,bazelbuild/bazel,davidzchen/bazel,perezd/bazel,gavares/bazel,vt09/bazel,Ansahmadiba/bazel,snnn/bazel,JackSullivan/bazel,katre/bazel,Topher-the-Geek/bazel,bitemyapp/bazel,rzagabe/bazel,kamalmarhubi/bazel,kidaa/bazel,Krasnyanskiy/bazel,kidaa/bazel,murugamsm/bazel,kamalmarhubi/bazel,Digas29/bazel,manashmndl/bazel,rzagabe/bazel,Ansahmadiba/bazel,Krasnyanskiy/bazel,xindaya/bazel,dslomov/bazel,ulfjack/bazel,vt09/bazel,Krasnyanskiy/bazel,Asana/bazel,sicipio/bazel,ruo91/bazel,Ansahmadiba/bazel,anupcshan/bazel,d/bazel,sicipio/bazel,Topher-the-Geek/bazel,iamthearm/bazel,ulfjack/bazel,juhalindfors/bazel-patches,manashmndl/bazel,kchodorow/bazel-1,Krasnyanskiy/bazel,kidaa/bazel,mikelalcon/bazel,mbrukman/bazel,dropbox/bazel,dslomov/bazel,Topher-the-Geek/bazel,variac/bazel,snnn/bazel,Krasnyanskiy/bazel,ulfjack/bazel,mikelikespie/bazel,werkt/bazel,bitemyapp/bazel,kchodorow/bazel,damienmg/bazel,davidzchen/bazel,rhuss/bazel,Digas29/bazel,bitemyapp/bazel,charlieaustin/bazel,xindaya/bazel,dslomov/bazel-windows,joshua0pang/bazel,davidzchen/bazel,ruo91/bazel,dslomov/bazel,sicipio/bazel,d/bazel,ulfjack/bazel,Asana/bazel,vt09/bazel,joshua0pang/bazel,davidzchen/bazel,Ansahmadiba/bazel,werkt/bazel,abergmeier-dsfishlabs/bazel,murugamsm/bazel,vt09/bazel,murugamsm/bazel,damienmg/bazel,UrbanCompass/bazel,spxtr/bazel,safarmer/bazel,kchodorow/bazel-1,kchodorow/bazel,variac/bazel,asarazan/bazel,iamthearm/bazel,ulfjack/bazel,whuwxl/bazel,meteorcloudy/bazel,LuminateWireless/bazel,JackSullivan/bazel,kamalmarhubi/bazel,joshua0pang/bazel,Topher-the-Geek/bazel,charlieaustin/bazel,zhexuany/bazel,hhclam/bazel,akira-baruah/bazel,zhexuany/bazel,ButterflyNetwork/bazel,abergmeier-dsfishlabs/bazel,mbrukman/bazel,asarazan/bazel,dhootha/bazel,mikelikespie/bazel,kchodorow/bazel,mrdomino/bazel,mrdomino/bazel,meteorcloudy/bazel,juhalindfors/bazel-patches,dinowernli/bazel,twitter-forks/bazel,whuwxl/bazel,sicipio/bazel,perezd/bazel,bitemyapp/bazel,zhexuany/bazel,whuwxl/bazel,JackSullivan/bazel,ruo91/bazel,katre/bazel,JackSullivan/bazel,twitter-forks/bazel,gavares/bazel,joshua0pang/bazel,meteorcloudy/bazel,kchodorow/bazel-1,damienmg/bazel,asarazan/bazel,hhclam/bazel,JackSullivan/bazel,aehlig/bazel,wakashige/bazel,iamthearm/bazel,hhclam/bazel,meteorcloudy/bazel,dhootha/bazel,abergmeier-dsfishlabs/bazel,Ansahmadiba/bazel,LuminateWireless/bazel,charlieaustin/bazel,safarmer/bazel,dslomov/bazel-windows,variac/bazel,wakashige/bazel,manashmndl/bazel,anupcshan/bazel,Krasnyanskiy/bazel,dhootha/bazel,nkhuyu/bazel,dslomov/bazel-windows,xindaya/bazel,ulfjack/bazel,ruo91/bazel,katre/bazel,Digas29/bazel,gavares/bazel,nkhuyu/bazel,Topher-the-Geek/bazel,dinowernli/bazel,manashmndl/bazel,safarmer/bazel,rohitsaboo/bazel,Krasnyanskiy/bazel,gavares/bazel,meteorcloudy/bazel,kidaa/bazel,rzagabe/bazel,variac/bazel,werkt/bazel,juhalindfors/bazel-patches,kidaa/bazel,rohitsaboo/bazel,rhuss/bazel,ButterflyNetwork/bazel,rhuss/bazel,perezd/bazel,Asana/bazel,d/bazel,UrbanCompass/bazel,snnn/bazel,Asana/bazel,Ansahmadiba/bazel,rzagabe/bazel,nkhuyu/bazel,akira-baruah/bazel,cushon/bazel,mrdomino/bazel,damienmg/bazel,abergmeier-dsfishlabs/bazel,rzagabe/bazel,Asana/bazel,werkt/bazel,UrbanCompass/bazel,dslomov/bazel,zhexuany/bazel,mikelikespie/bazel,perezd/bazel,abergmeier-dsfishlabs/bazel,spxtr/bazel,LuminateWireless/bazel,anupcshan/bazel,charlieaustin/bazel,dinowernli/bazel,werkt/bazel,Topher-the-Geek/bazel,perezd/bazel,twitter-forks/bazel,dhootha/bazel,akira-baruah/bazel,kchodorow/bazel-1,aehlig/bazel,rhuss/bazel,bazelbuild/bazel,dslomov/bazel,d/bazel,kidaa/bazel,mrdomino/bazel,hermione521/bazel,dropbox/bazel,aehlig/bazel,snnn/bazel,d/bazel,katre/bazel,rhuss/bazel,dinowernli/bazel,meteorcloudy/bazel