Backout 780c48afccc1 (bug 831354) for Android reftest failures on a CLOSED TREE