Revert "Trimmed the branch to only the mm_mux_demux sub directory"

This reverts commit fc4f66c61249d5d0ef8954fd4477c83d3d414a97.
Rebase from 'upstream'
Trimmed the branch to only the mm_mux_demux sub directory