Changing version from Android 18 to 21