diff --git a/app/app.iml b/app/app.iml
index 1c289387..539222d2 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -102,17 +102,17 @@
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="bcprov-jdk15on-1.51" level="project" />
-    <orderEntry type="library" exported="" name="ion-2.0.1" level="project" />
+    <orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
     <orderEntry type="library" exported="" name="support-v4-r7" level="project" />
     <orderEntry type="library" exported="" name="jmdns-fixed" level="project" />
     <orderEntry type="library" exported="" name="bcpkix-jdk15on-1.51" level="project" />
     <orderEntry type="library" exported="" name="tinyrtsp" level="project" />
     <orderEntry type="library" exported="" name="okhttp-2.1.0" level="project" />
     <orderEntry type="library" exported="" name="limelight-common" level="project" />
-    <orderEntry type="library" exported="" name="gson-2.3" level="project" />
     <orderEntry type="library" exported="" name="okio-1.0.1" level="project" />
+    <orderEntry type="library" exported="" name="androidasync-e1dfb4" level="project" />
     <orderEntry type="library" exported="" name="jcodec-0.1.9" level="project" />
-    <orderEntry type="library" exported="" name="androidasync-2.0.1" level="project" />
+    <orderEntry type="library" exported="" name="ion-2f46fa" level="project" />
   </component>
 </module>
 
diff --git a/app/build.gradle b/app/build.gradle
index d17049e4..0ec0c447 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -62,13 +62,19 @@ android {
 }
 
 dependencies {
-    compile group: 'org.jcodec', name: 'jcodec', version: '0.1.9'
-    compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.51'
-    compile group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.51'
-    compile group: 'com.google.android', name: 'support-v4', version:'r7'
-    compile group: 'com.koushikdutta.ion', name: 'ion', version:'2.0.1'
-    compile group: 'com.squareup.okhttp', name: 'okhttp', version:'2.1.0'
-    compile group: 'com.squareup.okio', name:'okio', version:'1.0.1'
+    compile group: 'org.jcodec', name: 'jcodec', version: '+'
+    compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '+'
+    compile group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '+'
+    compile group: 'com.google.android', name: 'support-v4', version:'+'
+
+    // FIXME: Pending resolution of issue #346 using custom build
+    //compile group: 'com.koushikdutta.ion', name: 'ion', version:'+'
+    compile group: 'com.google.code.gson', name: 'gson', version:'+'
+    compile files('libs/androidasync-e1dfb4.jar')
+    compile files('libs/ion-2f46fa.jar')
+
+    compile group: 'com.squareup.okhttp', name: 'okhttp', version:'+'
+    compile group: 'com.squareup.okio', name:'okio', version:'+'
     compile files('libs/jmdns-fixed.jar')
     compile files('libs/limelight-common.jar')
     compile files('libs/tinyrtsp.jar')
diff --git a/app/libs/androidasync-e1dfb4.jar b/app/libs/androidasync-e1dfb4.jar
new file mode 100644
index 00000000..a583e4d5
Binary files /dev/null and b/app/libs/androidasync-e1dfb4.jar differ
diff --git a/app/libs/ion-2f46fa.jar b/app/libs/ion-2f46fa.jar
new file mode 100644
index 00000000..08fbea63
Binary files /dev/null and b/app/libs/ion-2f46fa.jar differ