Backed out changeset e2bba39c0385 (bug 995777) for Android 4.0 robocop-2 perma-fail.