Merge "Look for  additional media codec XML files" into sc-dev