default buildToolsVersion upgdate

* and bug fix