Fix for 20.0.0 build tools bug
Fix for 20.0.0 build tools bug

reference: https://code.google.com/p/android/issues/detail?id=77629
deshion/iosched,13yo/iosched,PareshMayani/iosched,lokeshpancharia/iosched,skaushikgit/iosched,b-cuts/iosched,13yo/iosched,AdrianHsu/iosched,ashcoding/iosched,TonyTangAndroid/iosched,ashcoding/iosched,muchbeer/iosched,google/iosched,ajsky/iosched,divyatman/iosched,The-WebOps-Club/saarang-iosched,andrewpetrovic/iosched,yzpniceboy/iosched,abhishek011/Test,ronzohan/iosched,sudanamin/iosched,PranaySPatil/iosched,ardock/iosched,ashcoding/iosched,ryantaoyf/iosched,ZJsnowman/iosched,aelx311/iosched,umitems/iosched,ben-upsilon/iosched,tnaffh/iosched,sbo3000/iosched,DCSH2O/iosched,eliezerint/iosched,ipmobiletech/iosched,xuanduc939/iosched,rhlass/iosched,trigged/iosched,epiphany27/iosched,ipmobiletech/iosched,jarekankowski/iosched,witchlock/iosched,spicykaiju/iosched,Pradeet/iosched,NileshJarad/iosched,gh0stbird/iosched,opozo/android-material-io,TribeMedia/iosched,vilyever/iosched,sebas-tc/iosched,NileshJarad/iosched,zhangfy068/iosched,Prographer/iosched,google/iosched,theDL/iosched,vilyever/iosched,liuqiwang01/iosched,vivekchand/iosched,lcyluo/iosched,zeXtreme/iosched,AdrianHsu/iosched,Chuck8080/iosched,sebas-tc/iosched,cliffmoturi/iosched,Huihuiyule-www/iosched,HeZaiJin/iosched,samirshrestha/iosched,tanweijiu/iosched,ash663/iosched,PaulRashidi/iosched,tjit777-naver-com/iosched,ajsky/iosched,ryantaoyf/iosched,zuoyanyouwu/iosched,lokling/AndroiditoJZ,divyatman/iosched,DCSH2O/iosched,yummy222/iosched,yoube/iosched,bhargav175/iosched,janzoner/iosched,TwentySevenC/iosched,jairofloress/iosched,skaushikgit/iosched,Lareth51/iosched,PriyaSGit/iosched,witchlock/iosched,zhou531078929/googleDemoiosched,GeorgeMe/iosched,ma5069073/iosched,sebas-tc/iosched,Patrichuan/iosched,rayzone107/iosched,Brooks0129/iosched,PranaySPatil/iosched,ztingle/GoogleIO-APP,aelx311/iosched,soulduse/iosched,ardock/iosched,zeetherocker/iosched,Dreezydraig/iosched,opozo/android-material-io,wing2407/iosched,GeorgeMe/iosched,fabiel016/iosched,yarhtut/iosched,nguyenhoanglam/iosched,Huihuiyule-www/iosched,chantw172/iosched,hejunbinlan/iosched,aecca/iosched,sbo3000/iosched,umitems/iosched,AdrianHsu/iosched,TribeMedia/iosched,andersonb/iosched,zuoyanyouwu/iosched,noxiouswinter/iosched-copy,zhou531078929/googleDemoiosched,Prographer/iosched,lcyluo/iosched,b-cuts/iosched,gaikwad411/iosched,lokeshpancharia/iosched,fsolovyev/iosched-ibeacon-for-joker,zeetherocker/iosched,mumer92/iosched,hejunbinlan/iosched,jarekankowski/iosched,andersonb/iosched,silicon-mountain/smconf-android,PareshMayani/iosched,xuanduc939/iosched,poovarasanvasudevan/iosched,xiaoyanit/iosched-1,Lareth51/iosched,Pradeet/iosched,ScHaFeR/iosched,ash663/iosched,lichen79/iosched,wing2407/iosched,cliffmoturi/iosched,rhlass/iosched,yzpniceboy/iosched,samirshrestha/iosched,lcyluo/iosched,zuoyanyouwu/iosched,eeVoskos/iosched,spicykaiju/iosched,Arisono/iosched,janzoner/iosched,jjdstr/iosched,Logan676/iosched,madisp/iosched,jjdstr/iosched,zayenCh/iosched,mumer92/iosched,lokeshpancharia/iosched,zhou531078929/googleDemoiosched,huangxueqiang/iosched,romannurik/iosched,hejunbinlan/iosched,sophiataskova/iosched,angeliaz/iosched,BanNT/iosched,BanNT/iosched,Dvik/iosched,silicon-mountain/smconf-android,kmdupr33/iosched,douglasjunior/iosched,Dreezydraig/iosched,BanNT/iosched,omkarnanda/Android-UI-demos,amardeshbd/iosched,rhlass/iosched,bhargav175/iosched,astroboyapple/iosched,haichuand/iosched,epiphany27/iosched,ipmobiletech/iosched,madisp/iosched,ipalermo/schedo,hggliu/iosched,rock3r/iosched-2014,haichuand/iosched,abhishek011/Test,eeVoskos/iosched,yummy222/iosched,Logan676/iosched,TouchBoarder/iosched,fsolovyev/iosched-ibeacon-for-joker,kyotoalgo/iosched,douglasjunior/iosched,AndroidBase/iosched,PibeDx/iosched,opozo/android-material-io,chantw172/iosched,vovs/confs2015,ma5069073/iosched,NileshJarad/iosched,fabiel016/iosched,romannurik/iosched,Arisono/iosched,vilyever/iosched,ajsky/iosched,lichen79/iosched,10045125/iosched,TouchBoarder/iosched,lichen79/iosched,PranaySPatil/iosched,Patrichuan/iosched,GeorgeMe/iosched,griddynamics/iosched-ibeacon-for-joker,google/iosched,yuzhiboi/iosched,Prographer/iosched,xiaoyanit/iosched-1,haichuand/iosched,408873559/Stealer,hxddh/iosched,ipalermo/schedo,aecca/iosched,tanweijiu/iosched,sachin-appdev/iosched,ardock/iosched,chenanze/iosched,griddynamics/iosched-ibeacon-for-joker,lichen79/iosched,kmdupr33/iosched,TonyTangAndroid/iosched,Arisono/iosched,nikolaz5/iosched,charany1/iosched,ztingle/GoogleIO-APP,The-WebOps-Club/saarang-iosched,huangxueqiang/iosched,chenanze/iosched,PareshMayani/iosched,rock3r/iosched-2014,silent-nischal/iosched,ben-upsilon/iosched,jotajr/iosched,Lareth51/iosched,bhargav175/iosched,ipalermo/schedo,TweetMap/iosched,sudanamin/iosched,sbo3000/iosched,ardock/iosched,gaikwad411/iosched,samirshrestha/iosched,nguyenducnhaty/iosched,andysinlight/iosched,jianxiansining/iosched,yuzhiboi/iosched,Dreezydraig/iosched,VictorJava/iosched,hggliu/iosched,kingslou/iosched,ztingle/GoogleIO-APP,vivekchand/iosched,amardeshbd/iosched,yoube/iosched,trigged/iosched,chrooter/iosched,TwentySevenC/iosched,jianxiansining/iosched,hubaoyu/iosched,umitems/iosched,andysinlight/iosched,mumer92/iosched,TweetMap/iosched,TribeMedia/iosched,HeZaiJin/iosched,legua25/iosched-2014,Logan676/iosched,soulduse/iosched,omkarnanda/Android-UI-demos,liuqiwang01/iosched,hubaoyu/iosched,AndroidBase/iosched,heymind/iosched,PriyaSGit/iosched,TouchBoarder/iosched,sudanamin/iosched,tanweijiu/iosched,dxiaogang/iosched,zayenCh/iosched,kingslou/iosched,gh0stbird/iosched,lokling/AndroiditoJZ,samirshrestha/iosched,yzpniceboy/iosched,deshion/iosched,nikolaz5/iosched,silicon-mountain/smconf-android,silicon-mountain/smconf-android,douglasjunior/iosched,liuqiwang01/iosched,The-WebOps-Club/saarang-iosched,jairofloress/iosched,ZJsnowman/iosched,kyotoalgo/iosched,yarhtut/iosched,yoube/iosched,kingslou/iosched,wangziqiang/iosched,ryantaoyf/iosched,poovarasanvasudevan/iosched,jianxiansining/iosched,dARKf3n1Xx/iosched,astroboyapple/iosched,ben-upsilon/iosched,WeRockStar/iosched,yuzhiboi/iosched,ronzohan/iosched,soulduse/iosched,yummy222/iosched,kyotoalgo/iosched,nguyenducnhaty/iosched,jotajr/iosched,spicykaiju/iosched,zhangfy068/iosched,silent-nischal/iosched,heymind/iosched,liviubirau/iosched,sophiataskova/iosched,cliffmoturi/iosched,TonyTangAndroid/iosched,zuoyanyouwu/iosched,zeetherocker/iosched,chantw172/iosched,legua25/iosched-2014,VictorJava/iosched,erpragatisingh/iosched,hggliu/iosched,Dvik/iosched,wangziqiang/iosched,zeXtreme/iosched,eeVoskos/iosched,Chuck8080/iosched,nguyenhoanglam/iosched,eliezerint/iosched,virm0nd/iosched,nikolaz5/iosched,charany1/iosched,muchbeer/iosched,xiaoyanit/iosched-1,trigged/iosched,theDL/iosched,madisp/iosched,TweetMap/iosched,griddynamics/iosched-ibeacon-for-joker,deshion/iosched,VictorJava/iosched,PibeDx/iosched,nguyenhoanglam/iosched,andysinlight/iosched,hubaoyu/iosched,sachin-appdev/iosched,silent-nischal/iosched,hxddh/iosched,xiaoyanit/iosched-1,erpragatisingh/iosched,chenanze/iosched,vovs/confs2015,ZJsnowman/iosched,TouchBoarder/iosched,eliezerint/iosched,tjit777-naver-com/iosched,zeXtreme/iosched,10045125/iosched,amardeshbd/iosched,amardeshbd/iosched,astroboyapple/iosched,epiphany27/iosched,TedaLIEz/iosched,sophiataskova/iosched,ben-upsilon/iosched,wangziqiang/iosched,dxiaogang/iosched,vivekchand/iosched,tnaffh/iosched,PriyaSGit/iosched,gaikwad411/iosched,janzoner/iosched,PaulRashidi/iosched,wing2407/iosched,MonoCloud/iosched,ScHaFeR/iosched,Logan676/iosched,fabiel016/iosched,Patrichuan/iosched,tjit777-naver-com/iosched,skaushikgit/iosched,ash663/iosched,ma5069073/iosched,virm0nd/iosched,janzoner/iosched,WeRockStar/iosched,vovs/confs2015,dARKf3n1Xx/iosched,b-cuts/iosched,aecca/iosched,witchlock/iosched,liviubirau/iosched,TribeMedia/iosched,DCSH2O/iosched,andersonb/iosched,noxiouswinter/iosched-copy,408873559/Stealer,lokling/AndroiditoJZ,408873559/Stealer,muchbeer/iosched,theDL/iosched,jairofloress/iosched,sachin-appdev/iosched,fsolovyev/iosched-ibeacon-for-joker,andrewpetrovic/iosched,MonoCloud/iosched,legua25/iosched-2014,erpragatisingh/iosched,Brooks0129/iosched,heymind/iosched,ztingle/GoogleIO-APP,virm0nd/iosched,Huihuiyule-www/iosched,nguyenducnhaty/iosched,ronzohan/iosched,HeZaiJin/iosched,zhou531078929/googleDemoiosched,chrooter/iosched,aelx311/iosched,chrooter/iosched,madisp/iosched,rayzone107/iosched,liviubirau/iosched,huangxueqiang/iosched,PareshMayani/iosched,rayzone107/iosched,jotajr/iosched,charany1/iosched,angeliaz/iosched,MonoCloud/iosched,zayenCh/iosched,zhangfy068/iosched,yarhtut/iosched,omkarnanda/Android-UI-demos,hxddh/iosched,dARKf3n1Xx/iosched,xuanduc939/iosched,ScHaFeR/iosched,kmdupr33/iosched,TwentySevenC/iosched,poovarasanvasudevan/iosched,tnaffh/iosched,WeRockStar/iosched,gh0stbird/iosched,TedaLIEz/iosched,Brooks0129/iosched,ashcoding/iosched,divyatman/iosched,jarekankowski/iosched,Pradeet/iosched,Dvik/iosched,TedaLIEz/iosched,andrewpetrovic/iosched,dxiaogang/iosched,PibeDx/iosched