diff --git a/library/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java b/library/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java
index 8ac0c64082..3349e05eda 100644
--- a/library/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java
+++ b/library/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java
@@ -202,7 +202,7 @@ public final class SimpleExoPlayerView extends FrameLayout {
 
     int playerLayoutId = R.layout.exo_simple_player_view;
     boolean useArtwork = true;
-    int defaultArtwork = 0;
+    int defaultArtworkId = 0;
     boolean useController = true;
     int surfaceType = SURFACE_TYPE_SURFACE_VIEW;
     int resizeMode = AspectRatioFrameLayout.RESIZE_MODE_FIT;
@@ -214,8 +214,8 @@ public final class SimpleExoPlayerView extends FrameLayout {
         playerLayoutId = a.getResourceId(R.styleable.SimpleExoPlayerView_player_layout_id,
             playerLayoutId);
         useArtwork = a.getBoolean(R.styleable.SimpleExoPlayerView_use_artwork, useArtwork);
-        defaultArtwork = a.getResourceId(R.styleable.SimpleExoPlayerView_default_artwork,
-                defaultArtwork);
+        defaultArtworkId = a.getResourceId(R.styleable.SimpleExoPlayerView_default_artwork,
+            defaultArtworkId);
         useController = a.getBoolean(R.styleable.SimpleExoPlayerView_use_controller, useController);
         surfaceType = a.getInt(R.styleable.SimpleExoPlayerView_surface_type, surfaceType);
         resizeMode = a.getInt(R.styleable.SimpleExoPlayerView_resize_mode, resizeMode);
@@ -257,8 +257,8 @@ public final class SimpleExoPlayerView extends FrameLayout {
     // Artwork view.
     artworkView = (ImageView) findViewById(R.id.exo_artwork);
     this.useArtwork = useArtwork && artworkView != null;
-    if (defaultArtwork != 0) {
-      this.defaultArtwork = BitmapFactory.decodeResource(context.getResources(), defaultArtwork);
+    if (defaultArtworkId != 0) {
+      defaultArtwork = BitmapFactory.decodeResource(context.getResources(), defaultArtworkId);
     }
 
     // Subtitle view.
diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java b/library/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java
index 0ddf17cbe9..4a2354e180 100644
--- a/library/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java
+++ b/library/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java
@@ -65,7 +65,7 @@ public interface DataSource {
    * @param buffer The buffer into which the read data should be stored.
    * @param offset The start offset into {@code buffer} at which data should be written.
    * @param readLength The maximum number of bytes to read.
-   * @return The number of bytes read, or {@link C#RESULT_END_OF_INPUT} if no data is avaliable
+   * @return The number of bytes read, or {@link C#RESULT_END_OF_INPUT} if no data is available
    *     because the end of the opened range has been reached.
    * @throws IOException If an error occurs reading from the source.
    */
diff --git a/library/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index f68b72fb65..d1bf5ac260 100644
--- a/library/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -438,10 +438,12 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
   }
 
   /**
-   * Returns true if the current frame should be dropped.
+   * Returns whether the buffer being processed should be dropped.
    *
-   * @param earlyUs Time indicating how early the frame is. Negative values indicate late frame.
-   * @param elapsedRealtimeUs Wall clock time.
+   * @param earlyUs The time until the buffer should be presented in microseconds. A negative value
+   *     indicates that the buffer is late.
+   * @param elapsedRealtimeUs {@link android.os.SystemClock#elapsedRealtime()} in microseconds,
+   *     measured at the start of the current iteration of the rendering loop.
    */
   protected boolean shouldDropOutputBuffer(long earlyUs, long elapsedRealtimeUs) {
     // Drop the frame if we're more than 30ms late rendering the frame.
diff --git a/library/src/main/res/drawable-v21/exo_controls_fastforward.xml b/library/src/main/res/drawable-v21/exo_controls_fastforward.xml
index 945d70eef3..4b86e109e9 100644
--- a/library/src/main/res/drawable-v21/exo_controls_fastforward.xml
+++ b/library/src/main/res/drawable-v21/exo_controls_fastforward.xml
@@ -1,8 +1,25 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  android:width="32dp"
-  android:height="32dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0">
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"/>
 
-  <path android:fillColor="#FFF" android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"/>
 </vector>
diff --git a/library/src/main/res/drawable-v21/exo_controls_next.xml b/library/src/main/res/drawable-v21/exo_controls_next.xml
index c96f1e4afe..6305bcbc90 100644
--- a/library/src/main/res/drawable-v21/exo_controls_next.xml
+++ b/library/src/main/res/drawable-v21/exo_controls_next.xml
@@ -1,8 +1,25 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  android:width="32dp"
-  android:height="32dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0">
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
 
-  <path android:fillColor="#FFF" android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
 </vector>
diff --git a/library/src/main/res/drawable-v21/exo_controls_pause.xml b/library/src/main/res/drawable-v21/exo_controls_pause.xml
index 69a17cb9a1..45cd68bed6 100644
--- a/library/src/main/res/drawable-v21/exo_controls_pause.xml
+++ b/library/src/main/res/drawable-v21/exo_controls_pause.xml
@@ -1,8 +1,25 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  android:width="32dp"
-  android:height="32dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0">
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
 
-  <path android:fillColor="#FFF" android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
 </vector>
diff --git a/library/src/main/res/drawable-v21/exo_controls_play.xml b/library/src/main/res/drawable-v21/exo_controls_play.xml
index c21978f7f2..c8c4cdb127 100644
--- a/library/src/main/res/drawable-v21/exo_controls_play.xml
+++ b/library/src/main/res/drawable-v21/exo_controls_play.xml
@@ -1,8 +1,25 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  android:width="32dp"
-  android:height="32dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0">
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M8,5v14l11,-7z"/>
 
-  <path android:fillColor="#FFF" android:pathData="M8,5v14l11,-7z"/>
 </vector>
diff --git a/library/src/main/res/drawable-v21/exo_controls_previous.xml b/library/src/main/res/drawable-v21/exo_controls_previous.xml
index c5789d5fe4..9564a2a350 100644
--- a/library/src/main/res/drawable-v21/exo_controls_previous.xml
+++ b/library/src/main/res/drawable-v21/exo_controls_previous.xml
@@ -1,8 +1,25 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  android:width="32dp"
-  android:height="32dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0">
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z"/>
 
-  <path android:fillColor="#FFF" android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z"/>
 </vector>
diff --git a/library/src/main/res/drawable-v21/exo_controls_rewind.xml b/library/src/main/res/drawable-v21/exo_controls_rewind.xml
index 6ecb8f8a27..976b706170 100644
--- a/library/src/main/res/drawable-v21/exo_controls_rewind.xml
+++ b/library/src/main/res/drawable-v21/exo_controls_rewind.xml
@@ -1,8 +1,25 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  android:width="32dp"
-  android:height="32dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0">
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M11,18L11,6l-8.5,6 8.5,6zM11.5,12l8.5,6L20,6l-8.5,6z"/>
 
-  <path android:fillColor="#FFF" android:pathData="M11,18L11,6l-8.5,6 8.5,6zM11.5,12l8.5,6L20,6l-8.5,6z"/>
 </vector>
diff --git a/library/src/main/res/drawable-xxxhdpi/exo_controls_fastforward.png b/library/src/main/res/drawable-xxxhdpi/exo_controls_fastforward.png
deleted file mode 100644
index af0435a8b7..0000000000
Binary files a/library/src/main/res/drawable-xxxhdpi/exo_controls_fastforward.png and /dev/null differ
diff --git a/library/src/main/res/drawable-xxxhdpi/exo_controls_next.png b/library/src/main/res/drawable-xxxhdpi/exo_controls_next.png
deleted file mode 100644
index 50916cf0e7..0000000000
Binary files a/library/src/main/res/drawable-xxxhdpi/exo_controls_next.png and /dev/null differ
diff --git a/library/src/main/res/drawable-xxxhdpi/exo_controls_pause.png b/library/src/main/res/drawable-xxxhdpi/exo_controls_pause.png
deleted file mode 100644
index 6a5c59335e..0000000000
Binary files a/library/src/main/res/drawable-xxxhdpi/exo_controls_pause.png and /dev/null differ
diff --git a/library/src/main/res/drawable-xxxhdpi/exo_controls_play.png b/library/src/main/res/drawable-xxxhdpi/exo_controls_play.png
deleted file mode 100644
index 5d1f452d0d..0000000000
Binary files a/library/src/main/res/drawable-xxxhdpi/exo_controls_play.png and /dev/null differ
diff --git a/library/src/main/res/drawable-xxxhdpi/exo_controls_previous.png b/library/src/main/res/drawable-xxxhdpi/exo_controls_previous.png
deleted file mode 100644
index 00f7b97d1b..0000000000
Binary files a/library/src/main/res/drawable-xxxhdpi/exo_controls_previous.png and /dev/null differ
diff --git a/library/src/main/res/drawable-xxxhdpi/exo_controls_rewind.png b/library/src/main/res/drawable-xxxhdpi/exo_controls_rewind.png
deleted file mode 100644
index 5f3bb94440..0000000000
Binary files a/library/src/main/res/drawable-xxxhdpi/exo_controls_rewind.png and /dev/null differ