Move to Android Studio. Do more work