Fix MediaStream build after renames in the merge.

Reviewed by: Sergio Correia