Migrated to Android Stdio .8.1