diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk
index b36ac2b57f..7ffe16fdd3 100644
--- a/android/native/jni/Android.mk
+++ b/android/native/jni/Android.mk
@@ -49,7 +49,7 @@ ifeq ($(PERF_TEST), 1)
 LOCAL_CFLAGS += -DPERF_TEST
 endif
 
-LOCAL_CFLAGS += -O3 -fno-stack-protector -funroll-loops -DNDEBUG -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_VID_CONTEXT -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_ZLIB -DWANT_RZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREAD -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DRARCH_PERFORMANCE_MODE -DRARCH_GPU_PERFORMANCE_MODE -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99
+LOCAL_CFLAGS += -O3 -fno-stack-protector -funroll-loops -DNDEBUG -DHAVE_GRIFFIN -DANDROID -DPHOENIX_LEGACY -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_VID_CONTEXT -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_ZLIB -DWANT_RZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREAD -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DRARCH_PERFORMANCE_MODE -DRARCH_GPU_PERFORMANCE_MODE -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99
 
 LOCAL_LDLIBS	:= -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 -llog -ldl
 LOCAL_C_INCLUDES += $(LIBXML_PATH)
diff --git a/android/native/jni/main.c b/android/native/jni/main.c
index 4561854428..7cb1d9627f 100644
--- a/android/native/jni/main.c
+++ b/android/native/jni/main.c
@@ -339,6 +339,11 @@ static void* android_app_entry(void* param)
    RARCH_LOG("ROM Filename: [%s].\n", rom_path);
    RARCH_LOG("Libretro path: [%s].\n", libretro_path);
 
+#ifdef PHOENIX_LEGACY
+   /* ugly hack for now - hardcode libretro path to 'allowed' dir */
+   snprintf(libretro_path, sizeof(libretro_path), "/data/data/com.retroarch/lib/libretro.so");
+#endif
+
    int argc = 0;
    char *argv[MAX_ARGS] = {NULL};
 
diff --git a/android/phoenix-legacy/bin/AndroidManifest.xml b/android/phoenix-legacy/bin/AndroidManifest.xml
deleted file mode 100644
index cbb8bace7d..0000000000
--- a/android/phoenix-legacy/bin/AndroidManifest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.retroarch"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk android:minSdkVersion="15" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-
-    <application
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name">
-        <activity android:name="phoenix" android:label="@string/app_name" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:label="@string/app_name" android:name="com.retroarch.fileio.FileChooser" />
-        <activity android:label="@string/app_name" android:name="rombrowser" />
-        <activity android:name="android.app.NativeActivity" android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale">
-        	<meta-data android:name="android.app.lib_name" android:value="retroarch-activity" />
-         <meta-data android:name="android.app.func_name" android:value="ANativeActivity_onCreate" />
-        </activity>
-    </application>
-</manifest>
diff --git a/android/phoenix-legacy/bin/classes.dex b/android/phoenix-legacy/bin/classes.dex
deleted file mode 100644
index e9a4e6bd21..0000000000
Binary files a/android/phoenix-legacy/bin/classes.dex and /dev/null differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/BuildConfig.class b/android/phoenix-legacy/bin/classes/com/retroarch/BuildConfig.class
deleted file mode 100644
index 2ecbee69f1..0000000000
Binary files a/android/phoenix-legacy/bin/classes/com/retroarch/BuildConfig.class and /dev/null differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/R$attr.class b/android/phoenix-legacy/bin/classes/com/retroarch/R$attr.class
deleted file mode 100644
index f85362c78b..0000000000
Binary files a/android/phoenix-legacy/bin/classes/com/retroarch/R$attr.class and /dev/null differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/R$drawable.class b/android/phoenix-legacy/bin/classes/com/retroarch/R$drawable.class
deleted file mode 100644
index b93eebe08b..0000000000
Binary files a/android/phoenix-legacy/bin/classes/com/retroarch/R$drawable.class and /dev/null differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/R$id.class b/android/phoenix-legacy/bin/classes/com/retroarch/R$id.class
deleted file mode 100644
index aae32a79da..0000000000
Binary files a/android/phoenix-legacy/bin/classes/com/retroarch/R$id.class and /dev/null differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/R$layout.class b/android/phoenix-legacy/bin/classes/com/retroarch/R$layout.class
deleted file mode 100644
index 96e87c3030..0000000000
Binary files a/android/phoenix-legacy/bin/classes/com/retroarch/R$layout.class and /dev/null differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/R$menu.class b/android/phoenix-legacy/bin/classes/com/retroarch/R$menu.class
deleted file mode 100644
index a4b21a3768..0000000000
Binary files a/android/phoenix-legacy/bin/classes/com/retroarch/R$menu.class and /dev/null differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/R$raw.class b/android/phoenix-legacy/bin/classes/com/retroarch/R$raw.class
deleted file mode 100644
index fb954f5c0c..0000000000
Binary files a/android/phoenix-legacy/bin/classes/com/retroarch/R$raw.class and /dev/null differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/R$string.class b/android/phoenix-legacy/bin/classes/com/retroarch/R$string.class
deleted file mode 100644
index f27217fc85..0000000000
Binary files a/android/phoenix-legacy/bin/classes/com/retroarch/R$string.class and /dev/null differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/R.class b/android/phoenix-legacy/bin/classes/com/retroarch/R.class
deleted file mode 100644
index 2616b4cb55..0000000000
Binary files a/android/phoenix-legacy/bin/classes/com/retroarch/R.class and /dev/null differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/fileio/FileArrayAdapter.class b/android/phoenix-legacy/bin/classes/com/retroarch/fileio/FileArrayAdapter.class
deleted file mode 100644
index e7c2806d7d..0000000000
Binary files a/android/phoenix-legacy/bin/classes/com/retroarch/fileio/FileArrayAdapter.class and /dev/null differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/fileio/FileChooser$1.class b/android/phoenix-legacy/bin/classes/com/retroarch/fileio/FileChooser$1.class
deleted file mode 100644
index 09734e9e90..0000000000
Binary files a/android/phoenix-legacy/bin/classes/com/retroarch/fileio/FileChooser$1.class and /dev/null differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/fileio/FileChooser$2.class b/android/phoenix-legacy/bin/classes/com/retroarch/fileio/FileChooser$2.class
deleted file mode 100644
index 80ae290209..0000000000
Binary files a/android/phoenix-legacy/bin/classes/com/retroarch/fileio/FileChooser$2.class and /dev/null differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/fileio/FileChooser.class b/android/phoenix-legacy/bin/classes/com/retroarch/fileio/FileChooser.class
deleted file mode 100644
index 89c613e3fa..0000000000
Binary files a/android/phoenix-legacy/bin/classes/com/retroarch/fileio/FileChooser.class and /dev/null differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/fileio/Option.class b/android/phoenix-legacy/bin/classes/com/retroarch/fileio/Option.class
deleted file mode 100644
index ec370bac48..0000000000
Binary files a/android/phoenix-legacy/bin/classes/com/retroarch/fileio/Option.class and /dev/null differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/phoenix.class b/android/phoenix-legacy/bin/classes/com/retroarch/phoenix.class
deleted file mode 100644
index 1fa1ef40a7..0000000000
Binary files a/android/phoenix-legacy/bin/classes/com/retroarch/phoenix.class and /dev/null differ
diff --git a/android/phoenix-legacy/bin/com.retroarch.phoenix.apk b/android/phoenix-legacy/bin/com.retroarch.phoenix.apk
deleted file mode 100644
index f60ac661b0..0000000000
Binary files a/android/phoenix-legacy/bin/com.retroarch.phoenix.apk and /dev/null differ
diff --git a/android/phoenix-legacy/bin/jarlist.cache b/android/phoenix-legacy/bin/jarlist.cache
deleted file mode 100644
index 1b5ec3f9c5..0000000000
--- a/android/phoenix-legacy/bin/jarlist.cache
+++ /dev/null
@@ -1,3 +0,0 @@
-# cache for current jar dependecy. DO NOT EDIT.
-# format is <lastModified> <length> <SHA-1> <path>
-# Encoding is UTF-8
diff --git a/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_load.png b/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_load.png
deleted file mode 100644
index 41ccd3e0c1..0000000000
Binary files a/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_load.png and /dev/null differ
diff --git a/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_main.png b/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_main.png
deleted file mode 100644
index b32c0dc547..0000000000
Binary files a/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_main.png and /dev/null differ
diff --git a/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_open.png b/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_open.png
deleted file mode 100644
index 81ba839115..0000000000
Binary files a/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_open.png and /dev/null differ
diff --git a/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_save.png b/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_save.png
deleted file mode 100644
index 8ef170b5b2..0000000000
Binary files a/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_save.png and /dev/null differ
diff --git a/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_settings.png b/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_settings.png
deleted file mode 100644
index 0656f268b3..0000000000
Binary files a/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_settings.png and /dev/null differ
diff --git a/android/phoenix-legacy/bin/res/drawable-hdpi/ic_launcher.png b/android/phoenix-legacy/bin/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 8f54eb57d7..0000000000
Binary files a/android/phoenix-legacy/bin/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_load.png b/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_load.png
deleted file mode 100644
index cf31f645a9..0000000000
Binary files a/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_load.png and /dev/null differ
diff --git a/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_main.png b/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_main.png
deleted file mode 100644
index b9807b2a93..0000000000
Binary files a/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_main.png and /dev/null differ
diff --git a/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_open.png b/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_open.png
deleted file mode 100644
index c547bb051e..0000000000
Binary files a/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_open.png and /dev/null differ
diff --git a/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_save.png b/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_save.png
deleted file mode 100644
index 3276f4863f..0000000000
Binary files a/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_save.png and /dev/null differ
diff --git a/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_settings.png b/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_settings.png
deleted file mode 100644
index 1e122e59c4..0000000000
Binary files a/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_settings.png and /dev/null differ
diff --git a/android/phoenix-legacy/bin/res/drawable-ldpi/ic_launcher.png b/android/phoenix-legacy/bin/res/drawable-ldpi/ic_launcher.png
deleted file mode 100644
index 919a51b73d..0000000000
Binary files a/android/phoenix-legacy/bin/res/drawable-ldpi/ic_launcher.png and /dev/null differ
diff --git a/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_load.png b/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_load.png
deleted file mode 100644
index 2620aa3cdb..0000000000
Binary files a/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_load.png and /dev/null differ
diff --git a/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_main.png b/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_main.png
deleted file mode 100644
index 7778606c02..0000000000
Binary files a/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_main.png and /dev/null differ
diff --git a/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_open.png b/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_open.png
deleted file mode 100644
index 8d40b88107..0000000000
Binary files a/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_open.png and /dev/null differ
diff --git a/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_save.png b/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_save.png
deleted file mode 100644
index 7860034b31..0000000000
Binary files a/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_save.png and /dev/null differ
diff --git a/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_settings.png b/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_settings.png
deleted file mode 100644
index 2e49322e68..0000000000
Binary files a/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_settings.png and /dev/null differ
diff --git a/android/phoenix-legacy/bin/res/drawable-mdpi/ic_launcher.png b/android/phoenix-legacy/bin/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 5ee9ffeeb0..0000000000
Binary files a/android/phoenix-legacy/bin/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_load.png b/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_load.png
deleted file mode 100644
index 41ccd3e0c1..0000000000
Binary files a/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_load.png and /dev/null differ
diff --git a/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_main.png b/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_main.png
deleted file mode 100644
index f0af65bd71..0000000000
Binary files a/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_main.png and /dev/null differ
diff --git a/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_open.png b/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_open.png
deleted file mode 100644
index 81ba839115..0000000000
Binary files a/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_open.png and /dev/null differ
diff --git a/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_save.png b/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_save.png
deleted file mode 100644
index 8ef170b5b2..0000000000
Binary files a/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_save.png and /dev/null differ
diff --git a/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_settings.png b/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_settings.png
deleted file mode 100644
index 0656f268b3..0000000000
Binary files a/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_settings.png and /dev/null differ
diff --git a/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_launcher.png b/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 786d296748..0000000000
Binary files a/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/android/phoenix-legacy/bin/resources.ap_ b/android/phoenix-legacy/bin/resources.ap_
deleted file mode 100644
index 4120a31298..0000000000
Binary files a/android/phoenix-legacy/bin/resources.ap_ and /dev/null differ
diff --git a/audio/opensl.c b/audio/opensl.c
index 7af0ec1452..f672b99e89 100644
--- a/audio/opensl.c
+++ b/audio/opensl.c
@@ -136,7 +136,7 @@ static void *sl_init(const char *device, unsigned rate, unsigned latency)
    if(api_level > 15)
    {
       RARCH_LOG("API level 16 and higher has a fast OpenSL mixer - adjust settings for lower audio latency...\n");
-      sl->buf_count = 8;
+      sl->buf_count = 4;
    }
    else
       sl->buf_count = 8;