Back out 820188e039a0 (bug 1067748) for Android reftest-2 failures