Merge "Move media/* to media/framework/"