Merge branch 'gh-pages' of persistent-https://github.com/google/ExoPlayer into gh-pages

_includes/figure.html

 <figure align="center">
-    <img src="{{ site.baseurl }}{{ include.url }}" alt="{{ include.caption }}" />
+    <img src="{{ site.baseurl }}{{ include.url }}" alt="{{ include.caption }}"
+      {% if include.width %}
+        width="{{ include.width }}"
+      {% endif %}
+      {% if include.height %}
+        height="{{ include.height }}"
+      {% endif %}
+    />
     <figcaption><strong>Figure {{ include.index }}.</strong> {{ include.caption }}</figcaption>
 </figure>

demo-application.md

@@ -39,7 +39,7 @@ We recommend using a physical device if possible. If you wish to use an emulator
 instead, please read [FAQ - Does ExoPlayer support emulators?][] and ensure
 that your Virtual Device uses a system image with an API level of at least 23.
 
-{% include figure.html url="/images/demo-app-screenshots.png" index="2" caption="SampleChooserActivity and PlayerActivity" %}
+{% include figure.html url="/images/demo-app-screenshots.png" index="2" caption="SampleChooserActivity and PlayerActivity" scale="50%" %}
 
 The demo app presents of a list of samples (`SampleChooserActivity`). Selecting
 a sample will open a second activity (`PlayerActivity`) for playback. The demo