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

Change-Id: I688fc0ea65049d6d2d3f25b074e3e8df0a22287b