I think im OK with commenting/uncommenting includes if it means we can use the latest version of Android Studio. Not surprised this was an issue.