Merge "Merge mediarouteprovider into mediaroutertest"