Update to work with android studio beta