[Android] Update targetSDK and fix libvlc manifest

[Geoffrey Métais]

vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Mon Nov 21 14:47:12 2016 +0100| [cab6ab0bf426909e1aa0e23132d12d7160d5ef4f] | committer: Geoffrey Métais

Update targetSDK and fix libvlc manifest

> https://code.videolan.org/videolan/vlc-android/commit/cab6ab0bf426909e1aa0e23132d12d7160d5ef4f
---

 libvlc/AndroidManifest.xml      | 4 +---
 vlc-android/AndroidManifest.xml | 5 +----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/libvlc/AndroidManifest.xml b/libvlc/AndroidManifest.xml
index 42fd9ba..6e2e9d9 100644
--- a/libvlc/AndroidManifest.xml
+++ b/libvlc/AndroidManifest.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.videolan" android:versionCode="2" android:versionName="3.0.0">
-    <application>
-    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="22"/>
-</application>
+    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="24"/>
 </manifest> 
diff --git a/vlc-android/AndroidManifest.xml b/vlc-android/AndroidManifest.xml
index 29c7d46..278c8b8 100644
--- a/vlc-android/AndroidManifest.xml
+++ b/vlc-android/AndroidManifest.xml
@@ -26,7 +26,7 @@
 
     <uses-sdk
         android:minSdkVersion="9"
-        android:targetSdkVersion="23"
+        android:targetSdkVersion="24"
         tools:overrideLibrary="android.support.v17.leanback, android.support.v14.preference, android.support.v17.preference" />
 
     <uses-permission android:name="android.permission.READ_LOGS"
@@ -38,9 +38,6 @@
     <!-- used for setting ringtone -->
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
 
-    <!-- FIXME Because manifest merger will add it otherwise... -->
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" tools:node="remove" />
-
     <!-- STORAGE -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />