Merge remainder of https://github.com/google/ExoPlayer/pull/2372

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=148344124

demo/src/main/assets/media.exolist.json

@@ -278,6 +278,18 @@
     ]
     ]
   },
   },
   {
   {
+    "name": "ClearKey DASH",
+    "samples": [
+      {
+        "name": "Big Buck Bunny (CENC ClearKey)",
+        "uri": "http://html5.cablelabs.com:8100/cenc/ck/dash.mpd",
+        "extension": "mpd",
+        "drm_scheme": "cenc",
+        "drm_license_url": "https://wasabeef.jp/demos/cenc-ck-dash.json"
+      }
+    ]
+  },
+  {
     "name": "SmoothStreaming",
     "name": "SmoothStreaming",
     "samples": [
     "samples": [
       {
       {