auto merge of #4013 : glennw/servo/android-resources, r=larsbergstrom
auto merge of #4013 : glennw/servo/android-resources, r=larsbergstrom

This is a temporary solution, until they are packaged properly.

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