Merge "Split mediaprovider from priv_app."