diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
index 12fa07c71b..e1c08cf332 100644
--- a/Source/Android/AndroidManifest.xml
+++ b/Source/Android/AndroidManifest.xml
@@ -6,8 +6,8 @@
     android:installLocation="auto">
 
     <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="19" />
+        android:minSdkVersion="17"
+        android:targetSdkVersion="21" />
 
     <uses-feature android:glEsVersion="0x00020000" />
 
@@ -19,7 +19,8 @@
     <application
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:allowBackup="true">
+        android:allowBackup="true"
+        android:supportsRtl="true">
         <activity
             android:name="org.dolphinemu.dolphinemu.gamelist.GameListActivity"
             android:label="@string/app_name"
diff --git a/Source/Android/res/layout/about_layout.xml b/Source/Android/res/layout/about_layout.xml
index 9c5b84e9ed..b3110331a5 100644
--- a/Source/Android/res/layout/about_layout.xml
+++ b/Source/Android/res/layout/about_layout.xml
@@ -9,7 +9,7 @@
         android:id="@+id/AboutItemTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="15dip"
+        android:layout_marginStart="15dip"
         android:layout_marginTop="6dip"
         android:singleLine="true"
         android:textAppearance="?android:attr/textAppearanceMedium"/>
@@ -18,7 +18,7 @@
         android:id="@+id/AboutItemSubTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="15dip"
+        android:layout_marginStart="15dip"
         android:textAppearance="?android:attr/textAppearanceSmall"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/Source/Android/res/layout/folderbrowser_list_item.xml b/Source/Android/res/layout/folderbrowser_list_item.xml
index 15877bb64a..318efc75ec 100644
--- a/Source/Android/res/layout/folderbrowser_list_item.xml
+++ b/Source/Android/res/layout/folderbrowser_list_item.xml
@@ -14,7 +14,7 @@
 
         android:layout_alignParentTop="true"
         android:layout_alignParentBottom="true"
-        android:layout_marginRight="6dip"/>
+        android:layout_marginEnd="6dip"/>
 
     <!-- Properties in the 'tools' namespace are only visible in the UI editor, not at runtime. -->
     <TextView tools:text="@string/file_size"
@@ -24,9 +24,9 @@
 
         android:textColor="#bbbbbb"
 
-        android:layout_toRightOf="@id/BrowserItemIcon"
+        android:layout_toEndOf="@id/BrowserItemIcon"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
 
         android:singleLine="true"
         android:ellipsize="marquee"
@@ -45,8 +45,8 @@
         android:singleLine="true"
         android:ellipsize="end"
 
-        android:layout_toRightOf="@id/BrowserItemIcon"
-        android:layout_alignParentRight="true"
+        android:layout_toEndOf="@id/BrowserItemIcon"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentTop="true"
         android:layout_above="@id/BrowserItemSubTitle"
         android:layout_alignWithParentIfMissing="true"
diff --git a/Source/Android/res/layout/gamelist_list_item.xml b/Source/Android/res/layout/gamelist_list_item.xml
index 2d7c204d4d..c2d722c31c 100644
--- a/Source/Android/res/layout/gamelist_list_item.xml
+++ b/Source/Android/res/layout/gamelist_list_item.xml
@@ -14,7 +14,7 @@
 
         android:layout_alignParentTop="true"
         android:layout_alignParentBottom="true"
-        android:layout_marginRight="6dip"/>
+        android:layout_marginEnd="6dip"/>
 
     <!-- Properties in the 'tools' namespace are only visible in the UI editor, not at runtime. -->
     <TextView tools:text="@string/file_size"
@@ -24,9 +24,9 @@
 
         android:textColor="#bbbbbb"
 
-        android:layout_toRightOf="@id/GameListItemIcon"
+        android:layout_toEndOf="@id/GameListItemIcon"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
 
         android:singleLine="true"
         android:ellipsize="marquee"
@@ -45,8 +45,8 @@
         android:singleLine="true"
         android:ellipsize="end"
 
-        android:layout_toRightOf="@id/GameListItemIcon"
-        android:layout_alignParentRight="true"
+        android:layout_toEndOf="@id/GameListItemIcon"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentTop="true"
         android:layout_above="@id/GameListItemSubTitle"
         android:layout_alignWithParentIfMissing="true"
diff --git a/Source/Android/res/layout/sidemenu.xml b/Source/Android/res/layout/sidemenu.xml
index f690232e8b..f844630928 100644
--- a/Source/Android/res/layout/sidemenu.xml
+++ b/Source/Android/res/layout/sidemenu.xml
@@ -3,7 +3,7 @@
               xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="48dp"
-    android:gravity="left"
+    android:gravity="start"
     android:orientation="vertical" >
 
     <TextView
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java
index b66aa0a84f..769595c1b4 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java
@@ -53,6 +53,11 @@ public final class NativeLibrary
 		public static final int PRESSED = 1;
 	}
 
+	private NativeLibrary()
+	{
+		// Disallows instantiation.
+	}
+
 	/**
 	 * Default touchscreen device
 	 */
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java
index 97400c23b8..669ffe0094 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java
@@ -144,14 +144,7 @@ public final class FolderBrowser extends ListFragment
 		{
 			String isoPath = NativeLibrary.GetConfig("Dolphin.ini", "General", "ISOPath" + i, "");
 
-			if (isoPath.equals(currentDir.getPath()))
-			{
-				pathNotPresent = false;
-			}
-			else
-			{
-				pathNotPresent = true;
-			}
+			pathNotPresent = !isoPath.equals(currentDir.getPath());
 		}
 
 		// User doesn't have this path in the config, so add it.
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java
index 6459eda8d8..6e25a33804 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java
@@ -8,12 +8,8 @@ package org.dolphinemu.dolphinemu.gamelist;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.util.Log;
 
 import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
 
 import org.dolphinemu.dolphinemu.NativeLibrary;
 
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java
index 49ae2bfebd..d2ae56b40f 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java
@@ -21,6 +21,11 @@ import android.preference.PreferenceManager;
  */
 public final class UserPreferences
 {
+	private UserPreferences()
+	{
+		// Disallows instantiation.
+	}
+
 	/**
 	 * Loads the settings stored in the Dolphin ini config files to the shared preferences of this front-end.
 	 *