Update Android instrumentation tests to use JUnit4.

webrtc/sdk/android/instrumentationtests/AndroidManifest.xml

Index: webrtc/sdk/android/instrumentationtests/AndroidManifest.xml
diff --git a/webrtc/sdk/android/instrumentationtests/AndroidManifest.xml b/webrtc/sdk/android/instrumentationtests/AndroidManifest.xml
index 90f0aec1ed84d07964cdad2e9221d6b8f68efe81..27a9389d1becf454696840843fcb989da3d8a622 100644
--- a/webrtc/sdk/android/instrumentationtests/AndroidManifest.xml
+++ b/webrtc/sdk/android/instrumentationtests/AndroidManifest.xml
@@ -1,8 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.webrtc.test"
-    android:versionCode="1"
-    android:versionName="1.0" >
+<!--
+ *  Copyright 2017 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+-->
+
+<manifest
+      xmlns:android="http://schemas.android.com/apk/res/android"
+      package="org.webrtc">
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />
     <uses-feature android:glEsVersion="0x00020000" android:required="true" />
@@ -16,14 +24,13 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.RUN_INSTRUMENTATION" />
 
-    <instrumentation
-        android:name="android.test.InstrumentationTestRunner"
-        android:targetPackage="org.webrtc.test" />
-
-    <application
-        android:label="AndroidPeerconnectionTests" >
+    <application>
         <uses-library android:name="android.test.runner" />
     </application>
 
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="org.webrtc"
+        android:label="Tests for WebRTC Android SDK"/>
 </manifest>