Fix for some Android SDK versions