Move version name and version code from Manifest to build.gradle

shell/android-studio/app/build.gradle

@@ -8,6 +8,9 @@ android {
         applicationId "com.reicast.emulator"
         minSdkVersion 9
         targetSdkVersion 21
+        versionCode="7"
+        versionName="r7"
+        vectorDrawables.useSupportLibrary = true
 
         ndk {
             moduleName "dc"
@@ -60,4 +63,4 @@ dependencies {
         exclude module: 'junit'
     }
     compile fileTree(include: ['*.jar'], dir: 'libs')
-}
+}

shell/android-studio/app/src/main/AndroidManifest.xml

@@ -1,8 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.reicast.emulator"
-    android:versionCode="7"
-    android:versionName="r7" >
-    
+    package="com.reicast.emulator">
+
     <supports-screens
         android:anyDensity="true"
         android:largeScreens="true"
@@ -137,4 +135,4 @@
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
     </application>
 
-</manifest>
+</manifest>