Android version detection fix by @adrianmaurer