Removed #ifdef ANDROID from where it's not needed