Merge pull request #5876 from opengisch/revert_upgrade #8728

Job	Run time
build (arm64-android, android_arm64_v8a, OFF, android-arm64)	11m 56s
build (arm64-android, android_arm64_v8a, ON, android-arm64)	10m 50s
build (arm-neon-android, android_armv7, OFF, android-arm-neon)	12m 44s
build (arm-neon-android, android_armv7, ON, android-arm-neon)	11m 2s
build (x64-android, android_x86_64, OFF, android-x64)	11m 37s
build (x64-android, android_x86_64, ON, android-x64)	10m 57s
build (x86-android, android_x86, OFF, android-x86)	12m 43s
build (x86-android, android_x86, ON, android-x86)	11m 35s
comment (commit)	4s
deploy to play store	0s
comment (pr)	0s
	1h 33m 28s

Provide feedback