auto merge of #3969 : mbrubeck/servo/android-html5-cargo, r=larsbergstrom
auto merge of #3969 : mbrubeck/servo/android-html5-cargo, r=larsbergstrom

Fixes a build error.

saratang/servo,fiji-flo/servo,saratang/servo,shrenikgala/servo,j3parker/servo,fiji-flo/servo,youprofit/servo,RenaudParis/servo,aidanhs/servo,tafia/servo,rixrix/servo,boghison/servo,dvberkel/servo,dagnir/servo,dmarcos/servo,nick-thompson/servo,anthgur/servo,samfoo/servo,rnestler/servo,caldwell/servo,upsuper/servo,chotchki/servo,jdramani/servo,walac/servo,mbrubeck/servo,zentner-kyle/servo,notriddle/servo,rnestler/servo,thiagopnts/servo,runarberg/servo,mdibaiee/servo,dhananjay92/servo,michaelwu/servo,wpgallih/servo,saratang/servo,Adenilson/prototype-viewing-distance,zhangjunlei26/servo,Adenilson/prototype-viewing-distance,luniv/servo,canaltinova/servo,pyecs/servo,dvberkel/servo,ConnorGBrewster/servo,ruud-v-a/servo,wpgallih/servo,rixrix/servo,sadmansk/servo,rnestler/servo,wartman4404/servo,aweinstock314/servo,dhananjay92/servo,mukilan/servo,jgraham/servo,j3parker/servo,splav/servo,samfoo/servo,echochamber/servo,meh/servo,g-k/servo,steveklabnik/servo,brendandahl/servo,mattnenterprise/servo,DominoTree/servo,ConnorGBrewster/servo,saratang/servo,tempbottle/servo,brendandahl/servo,mattnenterprise/servo,aweinstock314/servo,wartman4404/servo,larsbergstrom/servo,anthgur/servo,KiChjang/servo,SimonSapin/servo,caldwell/servo,GreenRecycleBin/servo,hyowon/servo,pgonda/servo,dsandeephegde/servo,chotchki/servo,dsandeephegde/servo,mattnenterprise/servo,Adenilson/prototype-viewing-distance,srbhklkrn/SERVOENGINE,deokjinkim/servo,g-k/servo,deokjinkim/servo,jimberlage/servo,peterjoel/servo,deokjinkim/servo,youprofit/servo,szeged/servo,pgonda/servo,nerith/servo,nnethercote/servo,mdibaiee/servo,dati91/servo,kindersung/servo,youprofit/servo,rentongzhang/servo,runarberg/servo,saneyuki/servo,thiagopnts/servo,wartman4404/servo,A-deLuna/servo,aidanhs/servo,huonw/servo,shrenikgala/servo,sadmansk/servo,RenaudParis/servo,jgraham/servo,notriddle/servo,WriterOfAlicrow/servo,DominoTree/servo,larsbergstrom/servo,anthgur/servo,GreenRecycleBin/servo,thiagopnts/servo,aweinstock314/servo,WriterOfAlicrow/servo,peterjoel/servo,tafia/servo,canaltinova/servo,j3parker/servo,bjwbell/servo,indykish/servo,tschneidereit/servo,saneyuki/servo,wpgallih/servo,DominoTree/servo,rixrix/servo,dsandeephegde/servo,CJ8664/servo,srbhklkrn/SERVOENGINE,ruud-v-a/servo,nrc/servo,avadacatavra/servo,runarberg/servo,vks/servo,samfoo/servo,indykish/servo,AnthonyBroadCrawford/servo,splav/servo,j3parker/servo,AnthonyBroadCrawford/servo,aweinstock314/servo,GreenRecycleBin/servo,GyrosOfWar/servo,paulrouget/servo,emilio/servo,codemac/servo,s142857/servo,deokjinkim/servo,mattnenterprise/servo,dmarcos/servo,huonw/servo,caldwell/servo,hyowon/servo,GreenRecycleBin/servo,SimonSapin/servo,kindersung/servo,SimonSapin/servo,runarberg/servo,tempbottle/servo,froydnj/servo,evilpie/servo,bjwbell/servo,sadmansk/servo,DominoTree/servo,jlegendary/servo,notriddle/servo,codemac/servo,g-k/servo,CJ8664/servo,paulrouget/servo,ConnorGBrewster/servo,huonw/servo,shrenikgala/servo,caldwell/servo,youprofit/servo,KiChjang/servo,DominoTree/servo,snf/servo,fiji-flo/servo,wartman4404/servo,mbrubeck/servo,sadmansk/servo,WriterOfAlicrow/servo,luniv/servo,rixrix/servo,vks/servo,meh/servo,echochamber/servo,wpgallih/servo,larsbergstrom/servo,samfoo/servo,notriddle/servo,ConnorGBrewster/servo,szeged/servo,szeged/servo,echochamber/servo,jimberlage/servo,walac/servo,ryancanhelpyou/servo,ryancanhelpyou/servo,nick-thompson/servo,s142857/servo,nerith/servo,pgonda/servo,huonw/servo,CJ8664/servo,mt2d2/servo,WriterOfAlicrow/servo,vks/servo,snf/servo,dvberkel/servo,dmarcos/servo,canaltinova/servo,A-deLuna/servo,rixrix/servo,nick-thompson/servo,dsandeephegde/servo,luniv/servo,tschneidereit/servo,dagnir/servo,froydnj/servo,tafia/servo,Shraddha512/servo,tempbottle/servo,michaelwu/servo,indykish/servo,anthgur/servo,steveklabnik/servo,ryancanhelpyou/servo,j3parker/servo,snf/servo,upsuper/servo,brendandahl/servo,dvberkel/servo,pyecs/servo,froydnj/servo,dagnir/servo,rnestler/servo,zentner-kyle/servo,boghison/servo,tempbottle/servo,dhananjay92/servo,g-k/servo,samfoo/servo,tschneidereit/servo,pyfisch/servo,wpgallih/servo,saneyuki/servo,pyecs/servo,KiChjang/servo,dsandeephegde/servo,fiji-flo/servo,dmarcos/servo,nnethercote/servo,echochamber/servo,dati91/servo,CJ8664/servo,Shraddha512/servo,s142857/servo,sadmansk/servo,SimonSapin/servo,nerith/servo,canaltinova/servo,eddyb/servo,canaltinova/servo,anthgur/servo,tschneidereit/servo,nnethercote/servo,avadacatavra/servo,paulrouget/servo,notriddle/servo,mt2d2/servo,larsbergstrom/servo,zentner-kyle/servo,RenaudParis/servo,thiagopnts/servo,jgraham/servo,fiji-flo/servo,cbrewster/servo,GyrosOfWar/servo,pgonda/servo,pgonda/servo,KiChjang/servo,fiji-flo/servo,A-deLuna/servo,upsuper/servo,szeged/servo,paulrouget/servo,cbrewster/servo,sadmansk/servo,tschneidereit/servo,upsuper/servo,saneyuki/servo,hyowon/servo,mukilan/servo,steveklabnik/servo,wpgallih/servo,jgraham/servo,tafia/servo,pyfisch/servo,boghison/servo,pyecs/servo,zhangjunlei26/servo,jlegendary/servo,meh/servo,hyowon/servo,peterjoel/servo,dsandeephegde/servo,runarberg/servo,jgraham/servo,zhangjunlei26/servo,jdramani/servo,runarberg/servo,wpgallih/servo,Shraddha512/servo,DominoTree/servo,saneyuki/servo,zentner-kyle/servo,mdibaiee/servo,indykish/servo,aweinstock314/servo,s142857/servo,dmarcos/servo,RenaudParis/servo,jgraham/servo,mdibaiee/servo,rentongzhang/servo,codemac/servo,akosel/servo,szeged/servo,jimberlage/servo,j3parker/servo,Shraddha512/servo,karlito40/servo,larsbergstrom/servo,RenaudParis/servo,g-k/servo,dmarcos/servo,jdramani/servo,akosel/servo,runarberg/servo,tschneidereit/servo,pyfisch/servo,KiChjang/servo,youprofit/servo,nick-thompson/servo,jlegendary/servo,steveklabnik/servo,splav/servo,meh/servo,emilio/servo,srbhklkrn/SERVOENGINE,SimonSapin/servo,paulrouget/servo,emilio/servo,anthgur/servo,mt2d2/servo,bfrohs/servo,karlito40/servo,pyfisch/servo,rentongzhang/servo,jdramani/servo,ryancanhelpyou/servo,jgraham/servo,pgonda/servo,wartman4404/servo,dati91/servo,rentongzhang/servo,Adenilson/prototype-viewing-distance,boghison/servo,bjwbell/servo,A-deLuna/servo,brendandahl/servo,saneyuki/servo,jimberlage/servo,dmarcos/servo,cbrewster/servo,avadacatavra/servo,codemac/servo,srbhklkrn/SERVOENGINE,caldwell/servo,eddyb/servo,boghison/servo,huonw/servo,avadacatavra/servo,eddyb/servo,AnthonyBroadCrawford/servo,saratang/servo,GreenRecycleBin/servo,mukilan/servo,dagnir/servo,peterjoel/servo,deokjinkim/servo,rnestler/servo,szeged/servo,nrc/servo,anthgur/servo,dvberkel/servo,echochamber/servo,dati91/servo,dagnir/servo,dsandeephegde/servo,wpgallih/servo,tempbottle/servo,nnethercote/servo,avadacatavra/servo,mattnenterprise/servo,snf/servo,eddyb/servo,kindersung/servo,zentner-kyle/servo,saneyuki/servo,evilpie/servo,shrenikgala/servo,snf/servo,Adenilson/prototype-viewing-distance,emilio/servo,samfoo/servo,nick-thompson/servo,nrc/servo,rixrix/servo,shrenikgala/servo,ConnorGBrewster/servo,rentongzhang/servo,ryancanhelpyou/servo,s142857/servo,s142857/servo,avadacatavra/servo,ConnorGBrewster/servo,shrenikgala/servo,meh/servo,akosel/servo,upsuper/servo,mt2d2/servo,kindersung/servo,peterjoel/servo,tempbottle/servo,pyfisch/servo,larsbergstrom/servo,echochamber/servo,aidanhs/servo,thiagopnts/servo,splav/servo,splav/servo,ruud-v-a/servo,nnethercote/servo,bfrohs/servo,cbrewster/servo,notriddle/servo,GyrosOfWar/servo,evilpie/servo,mattnenterprise/servo,walac/servo,aidanhs/servo,indykish/servo,evilpie/servo,steveklabnik/servo,srbhklkrn/SERVOENGINE,brendandahl/servo,dagnir/servo,CJ8664/servo,splav/servo,boghison/servo,jimberlage/servo,mattnenterprise/servo,szeged/servo,splav/servo,SimonSapin/servo,caldwell/servo,zentner-kyle/servo,mbrubeck/servo,mdibaiee/servo,evilpie/servo,notriddle/servo,wartman4404/servo,emilio/servo,canaltinova/servo,KiChjang/servo,bjwbell/servo,s142857/servo,tafia/servo,ruud-v-a/servo,evilpie/servo,Adenilson/prototype-viewing-distance,nrc/servo,meh/servo,pyfisch/servo,eddyb/servo,jlegendary/servo,GyrosOfWar/servo,GreenRecycleBin/servo,nerith/servo,larsbergstrom/servo,thiagopnts/servo,splav/servo,rnestler/servo,zhangjunlei26/servo,fiji-flo/servo,luniv/servo,SimonSapin/servo,j3parker/servo,akosel/servo,zhangjunlei26/servo,evilpie/servo,anthgur/servo,chotchki/servo,notriddle/servo,paulrouget/servo,AnthonyBroadCrawford/servo,CJ8664/servo,deokjinkim/servo,A-deLuna/servo,saneyuki/servo,mbrubeck/servo,aidanhs/servo,rnestler/servo,pgonda/servo,ruud-v-a/servo,Shraddha512/servo,zentner-kyle/servo,froydnj/servo,bfrohs/servo,wartman4404/servo,larsbergstrom/servo,zhangjunlei26/servo,aidanhs/servo,indykish/servo,evilpie/servo,dati91/servo,rixrix/servo,aweinstock314/servo,hyowon/servo,SimonSapin/servo,sadmansk/servo,saneyuki/servo,CJ8664/servo,paulrouget/servo,zhangjunlei26/servo,cbrewster/servo,karlito40/servo,RenaudParis/servo,mukilan/servo,tafia/servo,rentongzhang/servo,KiChjang/servo,srbhklkrn/SERVOENGINE,huonw/servo,walac/servo,bfrohs/servo,peterjoel/servo,splav/servo,nnethercote/servo,peterjoel/servo,pyfisch/servo,thiagopnts/servo,szeged/servo,AnthonyBroadCrawford/servo,saratang/servo,GreenRecycleBin/servo,pyecs/servo,aidanhs/servo,codemac/servo,mbrubeck/servo,rentongzhang/servo,samfoo/servo,szeged/servo,jdramani/servo,michaelwu/servo,steveklabnik/servo,notriddle/servo,AnthonyBroadCrawford/servo,vks/servo,paulrouget/servo,luniv/servo,upsuper/servo,KiChjang/servo,Adenilson/prototype-viewing-distance,eddyb/servo,mattnenterprise/servo,meh/servo,jdramani/servo,dhananjay92/servo,jlegendary/servo,huonw/servo,vks/servo,dati91/servo,tempbottle/servo,WriterOfAlicrow/servo,cbrewster/servo,upsuper/servo,mukilan/servo,brendandahl/servo,emilio/servo,notriddle/servo,emilio/servo,karlito40/servo,luniv/servo,codemac/servo,jimberlage/servo,dati91/servo,canaltinova/servo,A-deLuna/servo,nnethercote/servo,indykish/servo,dhananjay92/servo,chotchki/servo,nrc/servo,WriterOfAlicrow/servo,pyfisch/servo,nnethercote/servo,saratang/servo,deokjinkim/servo,thiagopnts/servo,ruud-v-a/servo,KiChjang/servo,g-k/servo,nerith/servo,echochamber/servo,jdramani/servo,eddyb/servo,emilio/servo,zhangjunlei26/servo,larsbergstrom/servo,ConnorGBrewster/servo,shrenikgala/servo,evilpie/servo,michaelwu/servo,youprofit/servo,Shraddha512/servo,akosel/servo,pyecs/servo,mbrubeck/servo,DominoTree/servo,ryancanhelpyou/servo,jimberlage/servo,luniv/servo,aweinstock314/servo,steveklabnik/servo,jlegendary/servo,RenaudParis/servo,pyfisch/servo,A-deLuna/servo,larsbergstrom/servo,GreenRecycleBin/servo,DominoTree/servo,bjwbell/servo,avadacatavra/servo,KiChjang/servo,WriterOfAlicrow/servo,mbrubeck/servo,akosel/servo,brendandahl/servo,caldwell/servo,nnethercote/servo,boghison/servo,dhananjay92/servo,peterjoel/servo,akosel/servo,karlito40/servo,ryancanhelpyou/servo,DominoTree/servo,AnthonyBroadCrawford/servo,hyowon/servo,tafia/servo,wpgallih/servo,dvberkel/servo,vks/servo,jlegendary/servo,splav/servo,karlito40/servo,dati91/servo,rnestler/servo,pyfisch/servo,GyrosOfWar/servo,mdibaiee/servo,chotchki/servo,chotchki/servo,cbrewster/servo,DominoTree/servo,hyowon/servo,zhangjunlei26/servo,bjwbell/servo,emilio/servo,avadacatavra/servo,michaelwu/servo,indykish/servo,bfrohs/servo,dagnir/servo,froydnj/servo,mt2d2/servo,cbrewster/servo,srbhklkrn/SERVOENGINE,mbrubeck/servo,paulrouget/servo,sadmansk/servo,peterjoel/servo,bjwbell/servo,szeged/servo,indykish/servo,Shraddha512/servo,saneyuki/servo,vks/servo,jimberlage/servo,michaelwu/servo,canaltinova/servo,paulrouget/servo,bfrohs/servo,mdibaiee/servo,fiji-flo/servo,nerith/servo,nick-thompson/servo,nick-thompson/servo,GyrosOfWar/servo,karlito40/servo,CJ8664/servo,nnethercote/servo,kindersung/servo,peterjoel/servo,dhananjay92/servo,nrc/servo,rixrix/servo,emilio/servo,dsandeephegde/servo,mt2d2/servo,kindersung/servo,GyrosOfWar/servo,GreenRecycleBin/servo,walac/servo,froydnj/servo,pyecs/servo,kindersung/servo,rixrix/servo,snf/servo,walac/servo,tschneidereit/servo,mukilan/servo,jimberlage/servo,walac/servo,upsuper/servo,snf/servo,g-k/servo,mt2d2/servo,nerith/servo,dvberkel/servo,youprofit/servo,codemac/servo,nrc/servo,ConnorGBrewster/servo,eddyb/servo