Merge "Move mediaprovider_app to common code"