Merge "Revert "Revert "Split mediaprovider from priv_app."""