Merge "Update ExoPlayer version" into rvc-dev am: 005731d962 am: 4b3c6db812 am: f7eaef976b am: 9623f42b92

Change-Id: I5ff43fc79aa762d1b58871cc9f4ce0f58ddeafa1