diff --git a/demo/build.gradle b/demo/build.gradle
index 5a95cfff41..ff294ad0b5 100644
--- a/demo/build.gradle
+++ b/demo/build.gradle
@@ -14,12 +14,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 22
+        targetSdkVersion 23
     }
     buildTypes {
         release {
diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml
index 6dd5b055e7..9f487f3c52 100644
--- a/demo/src/main/AndroidManifest.xml
+++ b/demo/src/main/AndroidManifest.xml
@@ -23,7 +23,7 @@
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22"/>
+  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23"/>
 
   <application
       android:label="@string/application_name"
diff --git a/demo/src/main/project.properties b/demo/src/main/project.properties
index 4fdc858b92..a656b29329 100644
--- a/demo/src/main/project.properties
+++ b/demo/src/main/project.properties
@@ -8,6 +8,6 @@
 # project structure.
 
 # Project target.
-target=android-22
+target=android-23
 android.library=false
 android.library.reference.1=../../../library/src/main
diff --git a/demo_misc/vp9_opus_sw/build.gradle b/demo_misc/vp9_opus_sw/build.gradle
index 60f706e33e..5b6eac3ab3 100644
--- a/demo_misc/vp9_opus_sw/build.gradle
+++ b/demo_misc/vp9_opus_sw/build.gradle
@@ -14,12 +14,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 22
+        targetSdkVersion 23
     }
     buildTypes {
         release {
diff --git a/demo_misc/vp9_opus_sw/src/main/AndroidManifest.xml b/demo_misc/vp9_opus_sw/src/main/AndroidManifest.xml
index 05f231f072..d2c749d2a7 100644
--- a/demo_misc/vp9_opus_sw/src/main/AndroidManifest.xml
+++ b/demo_misc/vp9_opus_sw/src/main/AndroidManifest.xml
@@ -26,7 +26,7 @@
 
   <uses-feature android:glEsVersion="0x00020000"></uses-feature>
 
-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="22"/>
+  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
 
   <application
       tools:ignore="UnusedAttribute"
diff --git a/demo_misc/vp9_opus_sw/src/main/project.properties b/demo_misc/vp9_opus_sw/src/main/project.properties
index ca0c2d0867..f85c9b372d 100644
--- a/demo_misc/vp9_opus_sw/src/main/project.properties
+++ b/demo_misc/vp9_opus_sw/src/main/project.properties
@@ -11,7 +11,7 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-22
+target=android-23
 android.library.reference.1=../../../../library/src/main
 android.library.reference.2=../../../../extensions/opus/src/main
 android.library.reference.3=../../../../extensions/vp9/src/main
diff --git a/extensions/okhttp/build.gradle b/extensions/okhttp/build.gradle
index 4d616b2a43..4d257c42e3 100644
--- a/extensions/okhttp/build.gradle
+++ b/extensions/okhttp/build.gradle
@@ -13,13 +13,13 @@
 // limitations under the License.
 apply plugin: 'com.android.library'
 
-android{
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+android {
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 22
+        targetSdkVersion 23
     }
 
     buildTypes {
diff --git a/extensions/okhttp/src/main/AndroidManifest.xml b/extensions/okhttp/src/main/AndroidManifest.xml
index 507e98474c..8ca247dcaf 100644
--- a/extensions/okhttp/src/main/AndroidManifest.xml
+++ b/extensions/okhttp/src/main/AndroidManifest.xml
@@ -17,6 +17,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.exoplayer.ext.okhttp">
 
-    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="22"/>
+    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
 
 </manifest>
diff --git a/extensions/okhttp/src/main/project.properties b/extensions/okhttp/src/main/project.properties
index 2ed62fbfcf..b92a03b7ab 100644
--- a/extensions/okhttp/src/main/project.properties
+++ b/extensions/okhttp/src/main/project.properties
@@ -11,6 +11,6 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-22
+target=android-23
 android.library=true
 android.library.reference.1=../../../../library/src/main
diff --git a/extensions/opus/build.gradle b/extensions/opus/build.gradle
index 443d0d6601..9ccc1862aa 100644
--- a/extensions/opus/build.gradle
+++ b/extensions/opus/build.gradle
@@ -14,12 +14,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 22
+        targetSdkVersion 23
     }
 
     buildTypes {
diff --git a/extensions/opus/src/main/AndroidManifest.xml b/extensions/opus/src/main/AndroidManifest.xml
index 22c75aa76b..7c26ae79f3 100644
--- a/extensions/opus/src/main/AndroidManifest.xml
+++ b/extensions/opus/src/main/AndroidManifest.xml
@@ -17,6 +17,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.exoplayer.ext.opus">
 
-    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="22"/>
+    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
 
 </manifest>
diff --git a/extensions/opus/src/main/project.properties b/extensions/opus/src/main/project.properties
index 2ed62fbfcf..b92a03b7ab 100644
--- a/extensions/opus/src/main/project.properties
+++ b/extensions/opus/src/main/project.properties
@@ -11,6 +11,6 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-22
+target=android-23
 android.library=true
 android.library.reference.1=../../../../library/src/main
diff --git a/extensions/vp9/build.gradle b/extensions/vp9/build.gradle
index 443d0d6601..9ccc1862aa 100644
--- a/extensions/vp9/build.gradle
+++ b/extensions/vp9/build.gradle
@@ -14,12 +14,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 22
+        targetSdkVersion 23
     }
 
     buildTypes {
diff --git a/extensions/vp9/src/main/AndroidManifest.xml b/extensions/vp9/src/main/AndroidManifest.xml
index 3e21f70510..2869352679 100644
--- a/extensions/vp9/src/main/AndroidManifest.xml
+++ b/extensions/vp9/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.exoplayer.ext.vp9">
 
-    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="22"/>
+    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
     <uses-feature android:glEsVersion="0x00020000"/>
 
 </manifest>
diff --git a/extensions/vp9/src/main/project.properties b/extensions/vp9/src/main/project.properties
index 2ed62fbfcf..b92a03b7ab 100644
--- a/extensions/vp9/src/main/project.properties
+++ b/extensions/vp9/src/main/project.properties
@@ -11,6 +11,6 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-22
+target=android-23
 android.library=true
 android.library.reference.1=../../../../library/src/main
diff --git a/library/build.gradle b/library/build.gradle
index a68596bad6..0af4bb60a2 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -15,8 +15,8 @@ apply plugin: 'com.android.library'
 apply plugin: 'bintray-release'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         // Important: ExoPlayerLib specifies a minSdkVersion of 9 because
@@ -25,7 +25,7 @@ android {
         // functionality provided by the library requires API level 16 or
         // greater.
         minSdkVersion 9
-        targetSdkVersion 22
+        targetSdkVersion 23
     }
 
     buildTypes {
diff --git a/library/src/androidTest/AndroidManifest.xml b/library/src/androidTest/AndroidManifest.xml
index 0e6eba8cbd..6d2b1f6d08 100644
--- a/library/src/androidTest/AndroidManifest.xml
+++ b/library/src/androidTest/AndroidManifest.xml
@@ -18,7 +18,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer.test">
 
-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="22"/>
+  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
 
   <application android:debuggable="true"
       android:allowBackup="false"
diff --git a/library/src/androidTest/project.properties b/library/src/androidTest/project.properties
index 0031332ec9..dfce3e9cd6 100644
--- a/library/src/androidTest/project.properties
+++ b/library/src/androidTest/project.properties
@@ -11,6 +11,6 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-22
+target=android-23
 android.library=false
 android.library.reference.1=../main
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
index b36ae95abe..332b9178d7 100644
--- a/library/src/main/AndroidManifest.xml
+++ b/library/src/main/AndroidManifest.xml
@@ -29,6 +29,6 @@
     the library may be of use on older devices. However, please note that the core video playback
     functionality provided by the library requires API level 16 or greater.
   -->
-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="22"/>
+  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
 
 </manifest>
diff --git a/library/src/main/project.properties b/library/src/main/project.properties
index 95228a4fc6..1614ebb94a 100644
--- a/library/src/main/project.properties
+++ b/library/src/main/project.properties
@@ -8,5 +8,5 @@
 # project structure.
 
 # Project target.
-target=android-22
+target=android-23
 android.library=true
diff --git a/playbacktests/build.gradle b/playbacktests/build.gradle
index 5a95cfff41..ff294ad0b5 100644
--- a/playbacktests/build.gradle
+++ b/playbacktests/build.gradle
@@ -14,12 +14,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 22
+        targetSdkVersion 23
     }
     buildTypes {
         release {
diff --git a/playbacktests/src/main/AndroidManifest.xml b/playbacktests/src/main/AndroidManifest.xml
index d39b180ad8..ad9ea57494 100644
--- a/playbacktests/src/main/AndroidManifest.xml
+++ b/playbacktests/src/main/AndroidManifest.xml
@@ -23,7 +23,7 @@
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.WAKE_LOCK"/>
 
-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="22"/>
+  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
 
   <application android:debuggable="true"
       android:allowBackup="false"
diff --git a/playbacktests/src/main/project.properties b/playbacktests/src/main/project.properties
index 4fdc858b92..a656b29329 100644
--- a/playbacktests/src/main/project.properties
+++ b/playbacktests/src/main/project.properties
@@ -8,6 +8,6 @@
 # project structure.
 
 # Project target.
-target=android-22
+target=android-23
 android.library=false
 android.library.reference.1=../../../library/src/main