Merge "Update ExoPlayer version" into rvc-dev am: 005731d962 am: 5ad894b4cc

Change-Id: Icee2d88dd8ca01fa3ef834d93d9df26e99f8b7ee