Backed out changeset 10616214c160 (bug 1091916) for Android x86 S4 permafail.