auto merge of #4830 : glennw/servo/android-gl, r=mbrubeck
auto merge of #4830 : glennw/servo/android-gl, r=mbrubeck


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