Merge "Revert "Split mediaprovider from priv_app.""