TODO update
Remove gradle wrapper
Fix crash issues, upgrade to latest build tool/sdk versions