fix #4240: on map, treat Android 3.x as Android 2.x

This is a tentative fix, which has not been tested on real hardware.
It can be reverted if a better fix is found later.
Merge branch 'release' into upstream