Backed out changeset 66cc38d90f25 (bug 1112397) for making testSettingsMenuItems permafail on Android 4.0.