Updated android-switch-backport (refs android 2.1.2)