Merge "Add framework-media to sdk" into sc-dev