Update project to work with latest android studio