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

--HG--
extra : rebase_source : c0b340f22ab24456272451a88aea302b0f19026b