Bug 834999 - followup to remove useless dump() r=me a=tef+
Merge m-c to inbound.
Bug 821695 - Do not load videocontrols.xml if the audio/video tag does not need it. r=roc