Fix build project and updated gradle