Backout old b2g reftest oop patch
Update b2g reftest oop patch