Revert mini-aapt change that introduced test failures.
Revert mini-aapt change that introduced test failures.

Summary: This reverts commit 8ea205ff9277f948122f5dbe2f0d73a15ed4623e.

Test Plan: revert-hammer

raviagarwal7/buck,robbertvanginkel/buck,rmaz/buck,shs96c/buck,rmaz/buck,Addepar/buck,k21/buck,davido/buck,LegNeato/buck,bocon13/buck,MarkRunWu/buck,artiya4u/buck,clonetwin26/buck,Distrotech/buck,zhuxiaohao/buck,davido/buck,LegNeato/buck,1yvT0s/buck,rowillia/buck,LegNeato/buck,bocon13/buck,1yvT0s/buck,raviagarwal7/buck,pwz3n0/buck,raviagarwal7/buck,Addepar/buck,vine/buck,Heart2009/buck,daedric/buck,marcinkwiatkowski/buck,dsyang/buck,hgl888/buck,1yvT0s/buck,rmaz/buck,bocon13/buck,facebook/buck,mogers/buck,justinmuller/buck,shybovycha/buck,rhencke/buck,rhencke/buck,luiseduardohdbackup/buck,janicduplessis/buck,LegNeato/buck,clonetwin26/buck,SeleniumHQ/buck,JoelMarcey/buck,facebook/buck,rmaz/buck,ilya-klyuchnikov/buck,k21/buck,zhan-xiong/buck,ilya-klyuchnikov/buck,SeleniumHQ/buck,illicitonion/buck,artiya4u/buck,davido/buck,Distrotech/buck,nguyentruongtho/buck,lukw00/buck,brettwooldridge/buck,siddhartharay007/buck,k21/buck,vschs007/buck,hgl888/buck,pwz3n0/buck,artiya4u/buck,marcinkwiatkowski/buck,illicitonion/buck,illicitonion/buck,raviagarwal7/buck,darkforestzero/buck,k21/buck,illicitonion/buck,artiya4u/buck,davido/buck,lukw00/buck,JoelMarcey/buck,janicduplessis/buck,1yvT0s/buck,janicduplessis/buck,OkBuilds/buck,vine/buck,MarkRunWu/buck,Heart2009/buck,Learn-Android-app/buck,robbertvanginkel/buck,illicitonion/buck,1yvT0s/buck,rhencke/buck,vine/buck,Distrotech/buck,shybovycha/buck,janicduplessis/buck,liuyang-li/buck,shs96c/buck,janicduplessis/buck,davido/buck,rowillia/buck,vschs007/buck,grumpyjames/buck,LegNeato/buck,SeleniumHQ/buck,shs96c/buck,neonichu/buck,clonetwin26/buck,siddhartharay007/buck,artiya4u/buck,kageiit/buck,sdwilsh/buck,robbertvanginkel/buck,Heart2009/buck,rhencke/buck,shybovycha/buck,dushmis/buck,rowillia/buck,k21/buck,vschs007/buck,mikekap/buck,dpursehouse/buck,Addepar/buck,mnuessler/buck,MarkRunWu/buck,MarkRunWu/buck,romanoid/buck,dsyang/buck,shybovycha/buck,sdwilsh/buck,dpursehouse/buck,luiseduardohdbackup/buck,LegNeato/buck,clonetwin26/buck,luiseduardohdbackup/buck,Dominator008/buck,JoelMarcey/buck,shybovycha/buck,romanoid/buck,pwz3n0/buck,Learn-Android-app/buck,justinmuller/buck,bocon13/buck,facebook/buck,shybovycha/buck,k21/buck,1yvT0s/buck,luiseduardohdbackup/buck,brettwooldridge/buck,Addepar/buck,sdwilsh/buck,romanoid/buck,justinmuller/buck,SeleniumHQ/buck,romanoid/buck,zhan-xiong/buck,lukw00/buck,tgummerer/buck,marcinkwiatkowski/buck,zhan-xiong/buck,vschs007/buck,dushmis/buck,davido/buck,JoelMarcey/buck,darkforestzero/buck,LegNeato/buck,dushmis/buck,davido/buck,neonichu/buck,robbertvanginkel/buck,janicduplessis/buck,pwz3n0/buck,dsyang/buck,mogers/buck,hgl888/buck,Addepar/buck,clonetwin26/buck,LegNeato/buck,davido/buck,LegNeato/buck,rowillia/buck,OkBuilds/buck,darkforestzero/buck,dsyang/buck,hgl888/buck,vine/buck,marcinkwiatkowski/buck,SeleniumHQ/buck,brettwooldridge/buck,mikekap/buck,darkforestzero/buck,brettwooldridge/buck,zhan-xiong/buck,rowillia/buck,clonetwin26/buck,grumpyjames/buck,ilya-klyuchnikov/buck,janicduplessis/buck,Learn-Android-app/buck,1yvT0s/buck,ilya-klyuchnikov/buck,raviagarwal7/buck,bocon13/buck,brettwooldridge/buck,clonetwin26/buck,zhuxiaohao/buck,liuyang-li/buck,rmaz/buck,marcinkwiatkowski/buck,clonetwin26/buck,Dominator008/buck,rmaz/buck,Learn-Android-app/buck,Addepar/buck,Dominator008/buck,zhan-xiong/buck,raviagarwal7/buck,justinmuller/buck,Distrotech/buck,SeleniumHQ/buck,tgummerer/buck,Heart2009/buck,grumpyjames/buck,LegNeato/buck,ilya-klyuchnikov/buck,OkBuilds/buck,brettwooldridge/buck,Dominator008/buck,luiseduardohdbackup/buck,neonichu/buck,dsyang/buck,grumpyjames/buck,stuhood/buck,lukw00/buck,romanoid/buck,kageiit/buck,shs96c/buck,darkforestzero/buck,raviagarwal7/buck,sdwilsh/buck,mogers/buck,shs96c/buck,liuyang-li/buck,davido/buck,mnuessler/buck,stuhood/buck,daedric/buck,stuhood/buck,dpursehouse/buck,brettwooldridge/buck,bocon13/buck,zhuxiaohao/buck,dpursehouse/buck,justinmuller/buck,1yvT0s/buck,SeleniumHQ/buck,k21/buck,robbertvanginkel/buck,Learn-Android-app/buck,mnuessler/buck,raviagarwal7/buck,daedric/buck,Dominator008/buck,pwz3n0/buck,shybovycha/buck,romanoid/buck,robbertvanginkel/buck,sdwilsh/buck,justinmuller/buck,lukw00/buck,vschs007/buck,LegNeato/buck,k21/buck,shybovycha/buck,sdwilsh/buck,JoelMarcey/buck,artiya4u/buck,Addepar/buck,dsyang/buck,rowillia/buck,sdwilsh/buck,Dominator008/buck,vine/buck,brettwooldridge/buck,nguyentruongtho/buck,mogers/buck,SeleniumHQ/buck,romanoid/buck,dushmis/buck,stuhood/buck,romanoid/buck,marcinkwiatkowski/buck,Heart2009/buck,grumpyjames/buck,raviagarwal7/buck,darkforestzero/buck,marcinkwiatkowski/buck,Learn-Android-app/buck,OkBuilds/buck,mikekap/buck,daedric/buck,zpao/buck,brettwooldridge/buck,OkBuilds/buck,clonetwin26/buck,bocon13/buck,vschs007/buck,stuhood/buck,justinmuller/buck,OkBuilds/buck,vschs007/buck,ilya-klyuchnikov/buck,grumpyjames/buck,marcinkwiatkowski/buck,tgummerer/buck,artiya4u/buck,raviagarwal7/buck,vschs007/buck,vine/buck,janicduplessis/buck,vschs007/buck,rhencke/buck,janicduplessis/buck,illicitonion/buck,vine/buck,vschs007/buck,rowillia/buck,mnuessler/buck,luiseduardohdbackup/buck,rmaz/buck,kageiit/buck,siddhartharay007/buck,Distrotech/buck,stuhood/buck,Learn-Android-app/buck,stuhood/buck,zhuxiaohao/buck,neonichu/buck,ilya-klyuchnikov/buck,clonetwin26/buck,nguyentruongtho/buck,dsyang/buck,siddhartharay007/buck,tgummerer/buck,rowillia/buck,Learn-Android-app/buck,ilya-klyuchnikov/buck,Learn-Android-app/buck,k21/buck,JoelMarcey/buck,shybovycha/buck,justinmuller/buck,nguyentruongtho/buck,lukw00/buck,justinmuller/buck,darkforestzero/buck,rmaz/buck,lukw00/buck,tgummerer/buck,JoelMarcey/buck,facebook/buck,zhan-xiong/buck,mikekap/buck,mikekap/buck,janicduplessis/buck,zhan-xiong/buck,JoelMarcey/buck,k21/buck,darkforestzero/buck,Distrotech/buck,mogers/buck,robbertvanginkel/buck,neonichu/buck,daedric/buck,vschs007/buck,dushmis/buck,janicduplessis/buck,clonetwin26/buck,siddhartharay007/buck,mogers/buck,kageiit/buck,neonichu/buck,liuyang-li/buck,zhan-xiong/buck,illicitonion/buck,dpursehouse/buck,justinmuller/buck,tgummerer/buck,JoelMarcey/buck,justinmuller/buck,JoelMarcey/buck,dpursehouse/buck,bocon13/buck,facebook/buck,Heart2009/buck,brettwooldridge/buck,sdwilsh/buck,illicitonion/buck,daedric/buck,OkBuilds/buck,Dominator008/buck,robbertvanginkel/buck,liuyang-li/buck,nguyentruongtho/buck,MarkRunWu/buck,shs96c/buck,SeleniumHQ/buck,mikekap/buck,Learn-Android-app/buck,mikekap/buck,grumpyjames/buck,daedric/buck,ilya-klyuchnikov/buck,sdwilsh/buck,zpao/buck,romanoid/buck,shybovycha/buck,hgl888/buck,dsyang/buck,marcinkwiatkowski/buck,facebook/buck,illicitonion/buck,zhan-xiong/buck,robbertvanginkel/buck,dsyang/buck,Heart2009/buck,mikekap/buck,justinmuller/buck,dpursehouse/buck,robbertvanginkel/buck,zhuxiaohao/buck,Distrotech/buck,1yvT0s/buck,pwz3n0/buck,shs96c/buck,stuhood/buck,artiya4u/buck,zhan-xiong/buck,tgummerer/buck,liuyang-li/buck,OkBuilds/buck,Dominator008/buck,kageiit/buck,Distrotech/buck,mogers/buck,SeleniumHQ/buck,k21/buck,MarkRunWu/buck,mogers/buck,robbertvanginkel/buck,davido/buck,bocon13/buck,neonichu/buck,mnuessler/buck,liuyang-li/buck,mnuessler/buck,illicitonion/buck,luiseduardohdbackup/buck,Addepar/buck,Distrotech/buck,shs96c/buck,nguyentruongtho/buck,zhuxiaohao/buck,Dominator008/buck,lukw00/buck,zhuxiaohao/buck,marcinkwiatkowski/buck,rowillia/buck,davido/buck,sdwilsh/buck,Addepar/buck,ilya-klyuchnikov/buck,clonetwin26/buck,pwz3n0/buck,mikekap/buck,ilya-klyuchnikov/buck,rhencke/buck,romanoid/buck,pwz3n0/buck,mikekap/buck,darkforestzero/buck,robbertvanginkel/buck,OkBuilds/buck,grumpyjames/buck,siddhartharay007/buck,grumpyjames/buck,siddhartharay007/buck,dushmis/buck,robbertvanginkel/buck,grumpyjames/buck,zhuxiaohao/buck,janicduplessis/buck,daedric/buck,davido/buck,mogers/buck,shs96c/buck,vschs007/buck,rhencke/buck,stuhood/buck,zpao/buck,marcinkwiatkowski/buck,romanoid/buck,liuyang-li/buck,shs96c/buck,mnuessler/buck,zpao/buck,SeleniumHQ/buck,rmaz/buck,darkforestzero/buck,neonichu/buck,JoelMarcey/buck,bocon13/buck,dushmis/buck,Addepar/buck,zhan-xiong/buck,rhencke/buck,brettwooldridge/buck,rowillia/buck,raviagarwal7/buck,mikekap/buck,zpao/buck,mogers/buck,stuhood/buck,mogers/buck,lukw00/buck,vine/buck,dpursehouse/buck,vine/buck,Learn-Android-app/buck,shs96c/buck,darkforestzero/buck,brettwooldridge/buck,MarkRunWu/buck,luiseduardohdbackup/buck,marcinkwiatkowski/buck,MarkRunWu/buck,romanoid/buck,dsyang/buck,lukw00/buck,dushmis/buck,shs96c/buck,vschs007/buck,Heart2009/buck,tgummerer/buck,romanoid/buck,luiseduardohdbackup/buck,shs96c/buck,liuyang-li/buck,brettwooldridge/buck,rowillia/buck,rmaz/buck,darkforestzero/buck,SeleniumHQ/buck,neonichu/buck,kageiit/buck,OkBuilds/buck,rhencke/buck,ilya-klyuchnikov/buck,dushmis/buck,mikekap/buck,LegNeato/buck,Distrotech/buck,raviagarwal7/buck,justinmuller/buck,lukw00/buck,siddhartharay007/buck,sdwilsh/buck,Addepar/buck,sdwilsh/buck,dsyang/buck,marcinkwiatkowski/buck,grumpyjames/buck,bocon13/buck,rmaz/buck,shybovycha/buck,davido/buck,nguyentruongtho/buck,hgl888/buck,daedric/buck,rowillia/buck,daedric/buck,illicitonion/buck,illicitonion/buck,hgl888/buck,OkBuilds/buck,Addepar/buck,grumpyjames/buck,OkBuilds/buck,zpao/buck,Heart2009/buck,tgummerer/buck,raviagarwal7/buck,kageiit/buck,Dominator008/buck,daedric/buck,SeleniumHQ/buck,LegNeato/buck,tgummerer/buck,shybovycha/buck,rmaz/buck,pwz3n0/buck,Dominator008/buck,pwz3n0/buck,rmaz/buck,zhan-xiong/buck,Dominator008/buck,OkBuilds/buck,JoelMarcey/buck,sdwilsh/buck,ilya-klyuchnikov/buck,illicitonion/buck,daedric/buck,artiya4u/buck,tgummerer/buck,siddhartharay007/buck,vine/buck,liuyang-li/buck,zhuxiaohao/buck,mnuessler/buck,stuhood/buck,clonetwin26/buck,Addepar/buck,dsyang/buck,dsyang/buck,pwz3n0/buck,hgl888/buck,bocon13/buck,Distrotech/buck,k21/buck,darkforestzero/buck,daedric/buck,liuyang-li/buck,rhencke/buck,zpao/buck,shybovycha/buck,JoelMarcey/buck,zhan-xiong/buck,hgl888/buck,rhencke/buck,dushmis/buck,k21/buck,artiya4u/buck,artiya4u/buck,mnuessler/buck,vine/buck,facebook/buck