Backed out changesets c61c91ea40fe and 8ac5fed37830 (bug 1071769) for causing frequent Android reftest failures.