Auto merge of #6024 - larsbergstrom:android_update, r=mbrubeck
Auto merge of #6024 - larsbergstrom:android_update, r=mbrubeck

fixes #6002

r? @mbrubeck

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6024)
<!-- Reviewable:end -->

karlito40/servo,huonw/servo,bjwbell/servo,dagnir/servo,jimberlage/servo,emilio/servo,vks/servo,tschneidereit/servo,notriddle/servo,aidanhs/servo,zentner-kyle/servo,szeged/servo,RenaudParis/servo,jlegendary/servo,CJ8664/servo,DominoTree/servo,kindersung/servo,jlegendary/servo,huonw/servo,nnethercote/servo,pgonda/servo,nerith/servo,dati91/servo,anthgur/servo,tafia/servo,brendandahl/servo,avadacatavra/servo,GyrosOfWar/servo,pyfisch/servo,jlegendary/servo,akosel/servo,akosel/servo,dagnir/servo,samfoo/servo,runarberg/servo,peterjoel/servo,rentongzhang/servo,youprofit/servo,zentner-kyle/servo,KiChjang/servo,thiagopnts/servo,meh/servo,wartman4404/servo,GreenRecycleBin/servo,splav/servo,sadmansk/servo,mbrubeck/servo,hyowon/servo,WriterOfAlicrow/servo,fiji-flo/servo,codemac/servo,larsbergstrom/servo,pgonda/servo,thiagopnts/servo,meh/servo,anthgur/servo,sadmansk/servo,huonw/servo,ConnorGBrewster/servo,tafia/servo,bjwbell/servo,caldwell/servo,rixrix/servo,j3parker/servo,KiChjang/servo,kindersung/servo,larsbergstrom/servo,A-deLuna/servo,paulrouget/servo,nerith/servo,saneyuki/servo,pyfisch/servo,SimonSapin/servo,mbrubeck/servo,caldwell/servo,thiagopnts/servo,saratang/servo,canaltinova/servo,zhangjunlei26/servo,mt2d2/servo,eddyb/servo,sadmansk/servo,GyrosOfWar/servo,fiji-flo/servo,SimonSapin/servo,anthgur/servo,A-deLuna/servo,j3parker/servo,szeged/servo,emilio/servo,pyecs/servo,boghison/servo,GreenRecycleBin/servo,notriddle/servo,nnethercote/servo,jimberlage/servo,emilio/servo,tschneidereit/servo,A-deLuna/servo,DominoTree/servo,larsbergstrom/servo,bjwbell/servo,huonw/servo,peterjoel/servo,tschneidereit/servo,aweinstock314/servo,saneyuki/servo,emilio/servo,eddyb/servo,nrc/servo,GreenRecycleBin/servo,SimonSapin/servo,bjwbell/servo,DominoTree/servo,larsbergstrom/servo,notriddle/servo,peterjoel/servo,paulrouget/servo,steveklabnik/servo,CJ8664/servo,ryancanhelpyou/servo,canaltinova/servo,s142857/servo,zentner-kyle/servo,nnethercote/servo,KiChjang/servo,samfoo/servo,caldwell/servo,zentner-kyle/servo,dsandeephegde/servo,akosel/servo,emilio/servo,dhananjay92/servo,anthgur/servo,youprofit/servo,nerith/servo,tschneidereit/servo,upsuper/servo,eddyb/servo,szeged/servo,ryancanhelpyou/servo,cbrewster/servo,CJ8664/servo,saneyuki/servo,zhangjunlei26/servo,mattnenterprise/servo,A-deLuna/servo,dagnir/servo,mdibaiee/servo,codemac/servo,j3parker/servo,wartman4404/servo,nick-thompson/servo,dhananjay92/servo,tafia/servo,canaltinova/servo,mt2d2/servo,peterjoel/servo,AnthonyBroadCrawford/servo,pyecs/servo,upsuper/servo,AnthonyBroadCrawford/servo,jdramani/servo,mattnenterprise/servo,rixrix/servo,steveklabnik/servo,notriddle/servo,KiChjang/servo,tafia/servo,aweinstock314/servo,aweinstock314/servo,tempbottle/servo,youprofit/servo,rnestler/servo,zentner-kyle/servo,pyfisch/servo,upsuper/servo,rnestler/servo,upsuper/servo,emilio/servo,dagnir/servo,mdibaiee/servo,nerith/servo,steveklabnik/servo,jdramani/servo,splav/servo,meh/servo,dvberkel/servo,saratang/servo,karlito40/servo,ConnorGBrewster/servo,ConnorGBrewster/servo,szeged/servo,SimonSapin/servo,paulrouget/servo,codemac/servo,splav/servo,CJ8664/servo,dhananjay92/servo,szeged/servo,walac/servo,jgraham/servo,caldwell/servo,meh/servo,dsandeephegde/servo,mbrubeck/servo,GyrosOfWar/servo,SimonSapin/servo,WriterOfAlicrow/servo,akosel/servo,emilio/servo,DominoTree/servo,mbrubeck/servo,jimberlage/servo,tafia/servo,codemac/servo,pyfisch/servo,nrc/servo,SimonSapin/servo,runarberg/servo,ryancanhelpyou/servo,deokjinkim/servo,wartman4404/servo,boghison/servo,aidanhs/servo,kindersung/servo,cbrewster/servo,vks/servo,dati91/servo,steveklabnik/servo,tempbottle/servo,peterjoel/servo,eddyb/servo,jimberlage/servo,pyfisch/servo,runarberg/servo,AnthonyBroadCrawford/servo,pyfisch/servo,RenaudParis/servo,nrc/servo,ConnorGBrewster/servo,aidanhs/servo,GyrosOfWar/servo,nnethercote/servo,j3parker/servo,GyrosOfWar/servo,rixrix/servo,kindersung/servo,akosel/servo,codemac/servo,deokjinkim/servo,runarberg/servo,karlito40/servo,pgonda/servo,dvberkel/servo,peterjoel/servo,j3parker/servo,tempbottle/servo,mattnenterprise/servo,karlito40/servo,canaltinova/servo,meh/servo,GreenRecycleBin/servo,mt2d2/servo,zentner-kyle/servo,tafia/servo,brendandahl/servo,runarberg/servo,runarberg/servo,youprofit/servo,anthgur/servo,notriddle/servo,kindersung/servo,sadmansk/servo,KiChjang/servo,nnethercote/servo,rixrix/servo,hyowon/servo,mattnenterprise/servo,zhangjunlei26/servo,jimberlage/servo,jimberlage/servo,aidanhs/servo,steveklabnik/servo,rentongzhang/servo,rixrix/servo,WriterOfAlicrow/servo,cbrewster/servo,cbrewster/servo,rentongzhang/servo,AnthonyBroadCrawford/servo,avadacatavra/servo,thiagopnts/servo,avadacatavra/servo,jlegendary/servo,avadacatavra/servo,larsbergstrom/servo,dsandeephegde/servo,vks/servo,RenaudParis/servo,wartman4404/servo,peterjoel/servo,deokjinkim/servo,jlegendary/servo,pyfisch/servo,deokjinkim/servo,rnestler/servo,RenaudParis/servo,tafia/servo,saneyuki/servo,hyowon/servo,karlito40/servo,dhananjay92/servo,larsbergstrom/servo,szeged/servo,rixrix/servo,dagnir/servo,dhananjay92/servo,aweinstock314/servo,pyfisch/servo,ConnorGBrewster/servo,fiji-flo/servo,brendandahl/servo,SimonSapin/servo,huonw/servo,splav/servo,rnestler/servo,splav/servo,notriddle/servo,splav/servo,dagnir/servo,g-k/servo,tempbottle/servo,samfoo/servo,dati91/servo,wartman4404/servo,dati91/servo,hyowon/servo,A-deLuna/servo,cbrewster/servo,ryancanhelpyou/servo,thiagopnts/servo,GreenRecycleBin/servo,deokjinkim/servo,zhangjunlei26/servo,bjwbell/servo,walac/servo,AnthonyBroadCrawford/servo,paulrouget/servo,dati91/servo,larsbergstrom/servo,aweinstock314/servo,WriterOfAlicrow/servo,emilio/servo,samfoo/servo,ConnorGBrewster/servo,dati91/servo,meh/servo,dsandeephegde/servo,youprofit/servo,emilio/servo,mdibaiee/servo,DominoTree/servo,nrc/servo,GreenRecycleBin/servo,GyrosOfWar/servo,szeged/servo,mt2d2/servo,saneyuki/servo,DominoTree/servo,eddyb/servo,nick-thompson/servo,jdramani/servo,SimonSapin/servo,zhangjunlei26/servo,mt2d2/servo,dagnir/servo,sadmansk/servo,sadmansk/servo,sadmansk/servo,eddyb/servo,AnthonyBroadCrawford/servo,CJ8664/servo,mdibaiee/servo,deokjinkim/servo,splav/servo,cbrewster/servo,pgonda/servo,nerith/servo,samfoo/servo,g-k/servo,szeged/servo,saneyuki/servo,splav/servo,sadmansk/servo,pyecs/servo,KiChjang/servo,notriddle/servo,GreenRecycleBin/servo,nick-thompson/servo,paulrouget/servo,DominoTree/servo,fiji-flo/servo,boghison/servo,nerith/servo,boghison/servo,walac/servo,walac/servo,zhangjunlei26/servo,avadacatavra/servo,saratang/servo,CJ8664/servo,saneyuki/servo,rnestler/servo,rixrix/servo,vks/servo,s142857/servo,mdibaiee/servo,jlegendary/servo,paulrouget/servo,steveklabnik/servo,youprofit/servo,ryancanhelpyou/servo,s142857/servo,rnestler/servo,huonw/servo,thiagopnts/servo,WriterOfAlicrow/servo,jimberlage/servo,upsuper/servo,jdramani/servo,tschneidereit/servo,splav/servo,nnethercote/servo,avadacatavra/servo,canaltinova/servo,tschneidereit/servo,peterjoel/servo,walac/servo,jimberlage/servo,thiagopnts/servo,avadacatavra/servo,tempbottle/servo,dhananjay92/servo,saratang/servo,codemac/servo,nrc/servo,DominoTree/servo,pyecs/servo,fiji-flo/servo,bjwbell/servo,ryancanhelpyou/servo,boghison/servo,walac/servo,mbrubeck/servo,boghison/servo,runarberg/servo,upsuper/servo,caldwell/servo,WriterOfAlicrow/servo,saneyuki/servo,youprofit/servo,karlito40/servo,pyecs/servo,samfoo/servo,saratang/servo,larsbergstrom/servo,dvberkel/servo,walac/servo,boghison/servo,bjwbell/servo,mbrubeck/servo,brendandahl/servo,peterjoel/servo,rentongzhang/servo,ConnorGBrewster/servo,dhananjay92/servo,emilio/servo,steveklabnik/servo,tschneidereit/servo,KiChjang/servo,pgonda/servo,akosel/servo,DominoTree/servo,pgonda/servo,dsandeephegde/servo,kindersung/servo,g-k/servo,saratang/servo,KiChjang/servo,jgraham/servo,dvberkel/servo,zhangjunlei26/servo,mattnenterprise/servo,s142857/servo,pyecs/servo,jdramani/servo,rixrix/servo,rnestler/servo,A-deLuna/servo,brendandahl/servo,tempbottle/servo,paulrouget/servo,hyowon/servo,canaltinova/servo,jgraham/servo,caldwell/servo,nick-thompson/servo,szeged/servo,cbrewster/servo,s142857/servo,nrc/servo,mattnenterprise/servo,brendandahl/servo,aweinstock314/servo,nick-thompson/servo,WriterOfAlicrow/servo,g-k/servo,canaltinova/servo,dati91/servo,fiji-flo/servo,larsbergstrom/servo,jgraham/servo,zhangjunlei26/servo,notriddle/servo,hyowon/servo,pyfisch/servo,nick-thompson/servo,paulrouget/servo,tempbottle/servo,GyrosOfWar/servo,wartman4404/servo,ConnorGBrewster/servo,RenaudParis/servo,dati91/servo,GreenRecycleBin/servo,anthgur/servo,KiChjang/servo,brendandahl/servo,codemac/servo,upsuper/servo,szeged/servo,wartman4404/servo,A-deLuna/servo,deokjinkim/servo,meh/servo,pgonda/servo,akosel/servo,CJ8664/servo,fiji-flo/servo,j3parker/servo,pyecs/servo,canaltinova/servo,j3parker/servo,g-k/servo,g-k/servo,DominoTree/servo,nerith/servo,mdibaiee/servo,AnthonyBroadCrawford/servo,notriddle/servo,notriddle/servo,dvberkel/servo,karlito40/servo,nrc/servo,nnethercote/servo,vks/servo,mbrubeck/servo,nick-thompson/servo,jgraham/servo,anthgur/servo,paulrouget/servo,rixrix/servo,rentongzhang/servo,caldwell/servo,saneyuki/servo,dvberkel/servo,avadacatavra/servo,nnethercote/servo,CJ8664/servo,samfoo/servo,cbrewster/servo,nnethercote/servo,anthgur/servo,eddyb/servo,vks/servo,s142857/servo,GreenRecycleBin/servo,mt2d2/servo,g-k/servo,kindersung/servo,jdramani/servo,mdibaiee/servo,ryancanhelpyou/servo,rnestler/servo,mattnenterprise/servo,KiChjang/servo,rentongzhang/servo,mt2d2/servo,aidanhs/servo,hyowon/servo,rentongzhang/servo,aidanhs/servo,saneyuki/servo,fiji-flo/servo,eddyb/servo,upsuper/servo,zentner-kyle/servo,paulrouget/servo,huonw/servo,jlegendary/servo,jgraham/servo,s142857/servo,mbrubeck/servo,nnethercote/servo,RenaudParis/servo,jgraham/servo,peterjoel/servo,jimberlage/servo,thiagopnts/servo,splav/servo,dsandeephegde/servo,dvberkel/servo,zhangjunlei26/servo,vks/servo,mattnenterprise/servo,aidanhs/servo,aweinstock314/servo,larsbergstrom/servo,RenaudParis/servo,dsandeephegde/servo,pyfisch/servo,jdramani/servo,saratang/servo,dsandeephegde/servo