Updated buildToolsVersion
Cleanup
Cleanup