Backed out changeset 645d5e930e23 (bug 1067305) for inadvertently disabling all media tests on some platforms CLOSED TREE
Merge fx-team to m-c a=merge CLOSED TREE
Merge m-c to fx-team a=merge CLOSED TREE