Merge "Update ExoPlayer version" into rvc-dev