diff --git a/android/java/.gitignore b/android/java/.gitignore
index ddfa6128e..5f00b1092 100644
--- a/android/java/.gitignore
+++ b/android/java/.gitignore
@@ -11,7 +11,7 @@ build/
 *.apk
 
 # Lib assets
-lib/src/main/assets/
+MapboxGLAndroidSDK/src/main/assets/
 
 # Local settings
 local.properties
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java
index 93029c6f5..c4b1f496d 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java
@@ -14,7 +14,6 @@ import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.Spinner;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.mapbox.mapboxgl.lib.LonLatZoom;
 import com.mapbox.mapboxgl.lib.MapView;
@@ -23,7 +22,6 @@ import com.mapzen.android.lost.LocationListener;
 import com.mapzen.android.lost.LocationRequest;
 
 import java.util.ArrayList;
-import java.util.LinkedList;
 
 public class MainActivity extends ActionBarActivity {
 
@@ -70,30 +68,30 @@ public class MainActivity extends ActionBarActivity {
 
         // Load the layout
         setContentView(R.layout.activity_main);
-        mMapFragment = (MapFragment)getSupportFragmentManager().findFragmentById(R.id.fragment_map);
+        mMapFragment = (MapFragment) getSupportFragmentManager().findFragmentById(R.id.fragment_map);
         mMapFragment.getMap().setOnFpsChangedListener(new MyOnFpsChangedListener());
         mMapFragment.getMap().setOnMapChangedListener(new MyOnMapChangedListener());
 
-        mFpsTextView = (TextView)findViewById(R.id.view_fps);
+        mFpsTextView = (TextView) findViewById(R.id.view_fps);
         mFpsTextView.setText("");
 
-        mCompassView = (ImageView)findViewById(R.id.view_compass);
+        mCompassView = (ImageView) findViewById(R.id.view_compass);
         mCompassView.setOnClickListener(new CompassOnClickListener());
 
         // Add a toolbar as the action bar
-        Toolbar mainToolbar = (Toolbar)findViewById(R.id.toolbar_main);
+        Toolbar mainToolbar = (Toolbar) findViewById(R.id.toolbar_main);
         setSupportActionBar(mainToolbar);
         getSupportActionBar().setDisplayShowTitleEnabled(false);
 
         // Add the spinner to select map styles
-        Spinner styleSpinner = (Spinner)findViewById(R.id.spinner_style);
+        Spinner styleSpinner = (Spinner) findViewById(R.id.spinner_style);
         ArrayAdapter styleAdapter = ArrayAdapter.createFromResource(getSupportActionBar().getThemedContext(),
                 R.array.style_list, android.R.layout.simple_spinner_dropdown_item);
         styleSpinner.setAdapter(styleAdapter);
         styleSpinner.setOnItemSelectedListener(new StyleSpinnerListener());
 
         // Add the spinner to select class styles
-        mClassSpinner = (Spinner)findViewById(R.id.spinner_class);
+        mClassSpinner = (Spinner) findViewById(R.id.spinner_class);
         mOutdoorsClassAdapter = ArrayAdapter.createFromResource(getSupportActionBar().getThemedContext(),
                 R.array.outdoors_class_list, android.R.layout.simple_spinner_dropdown_item);
         mSatelliteClassAdapter = ArrayAdapter.createFromResource(getSupportActionBar().getThemedContext(),
@@ -364,7 +362,7 @@ public class MainActivity extends ActionBarActivity {
 
         @Override
         public void onMapChanged() {
-            mCompassView.setRotation((float)mMapFragment.getMap().getDirection());
+            mCompassView.setRotation((float) mMapFragment.getMap().getDirection());
         }
     }
 
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MapFragment.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MapFragment.java
index a9e6f0c89..0249dab29 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MapFragment.java
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MapFragment.java
@@ -48,7 +48,7 @@ public class MapFragment extends Fragment {
             String line = reader.readLine();
             mMap.setAccessToken(line);
         } catch (IOException e) {
-            // Do nothing
+            return null;
         }
 
         // Need to pass on any saved state to the map
diff --git a/android/scripts/common.sh b/android/scripts/common.sh
index 69f41997c..3244ed9d4 100755
--- a/android/scripts/common.sh
+++ b/android/scripts/common.sh
@@ -4,15 +4,15 @@ set -e
 set -o pipefail
 
 NAME=$1
-export JOBS=2
+export JOBS=`nproc`
 
 export CC=clang CXX=clang++
 export MASON_PLATFORM=android
 
-mkdir ./android/java/app/src/main/res/raw/
-echo "${MAPBOX_ACCESS_TOKEN}" >> ./android/java/app/src/main/res/raw/token.txt
+mkdir ./android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw/
+echo "${MAPBOX_ACCESS_TOKEN}" >> ./android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt
 
-make android BUILDTYPE=$BUILDTYPE JOBS=$JOBS
+make android -j$JOBS BUILDTYPE=$BUILDTYPE JOBS=$JOBS
 
-aws s3 cp ./android/java/app/build/outputs/apk/app-debug.apk s3://mapbox-gl-testing/android/${NAME}/app-debug.apk
-aws s3 cp ./android/java/app/build/outputs/apk/app-release-unsigned.apk s3://mapbox-gl-testing/android/${NAME}/app-release-unsigned.apk
+aws s3 cp ./android/java/MapboxGLAndroidSDKTestApp/build/outputs/apk/MapboxGLAndroidSDKTestApp-debug.apk s3://mapbox-gl-testing/android/${NAME}/MapboxGLAndroidSDKTestApp-debug.apk
+aws s3 cp ./android/java/MapboxGLAndroidSDKTestApp/build/outputs/apk/MapboxGLAndroidSDKTestApp-release-unsigned.apk s3://mapbox-gl-testing/android/${NAME}/MapboxGLAndroidSDKTestApp-release-unsigned.apk
diff --git a/android/scripts/copy-files.sh b/android/scripts/copy-files.sh
deleted file mode 100755
index 26de6068e..000000000
--- a/android/scripts/copy-files.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -o pipefail
-
-mkdir -p android/java/lib/src/main/jniLibs/${JNIDIR}
-cp build/android/${MASON_ANDROID_ABI}/out/${BUILDTYPE}/lib.target/libmapbox-gl.so android/java/lib/src/main/jniLibs/${JNIDIR}/libmapbox-gl.so
-${STRIP} --strip-unneeded android/java/lib/src/main/jniLibs/${JNIDIR}/libmapbox-gl.so
-mkdir -p android/java/lib/src/main/assets
-cp build/android/${MASON_ANDROID_ABI}/out/${BUILDTYPE}/ca-bundle.crt android/java/lib/src/main/assets/ca-bundle.crt
-cp -r build/android/${MASON_ANDROID_ABI}/out/${BUILDTYPE}/styles android/java/lib/src/main/assets/styles
diff --git a/gyp/platform-android.gypi b/gyp/platform-android.gypi
index cbd855e9c..bfaac7d4f 100644
--- a/gyp/platform-android.gypi
+++ b/gyp/platform-android.gypi
@@ -11,6 +11,7 @@
 
       'sources': [
         '../platform/android/log_android.cpp',
+        '../platform/android/asset_root.cpp',
         '../platform/default/string_stdlib.cpp',
         '../platform/default/image.cpp',
         '../platform/default/image_reader.cpp',
diff --git a/platform/android/asset_root.cpp b/platform/android/asset_root.cpp
new file mode 100644
index 000000000..4069211f6
--- /dev/null
+++ b/platform/android/asset_root.cpp
@@ -0,0 +1,16 @@
+#include <mbgl/platform/platform.hpp>
+#include <mbgl/android/jni.hpp>
+
+#include <uv.h>
+#include <libgen.h>
+
+namespace mbgl {
+namespace platform {
+
+// Returns the path to the root folder of the application.
+const std::string &assetRoot() {
+    return mbgl::android::apkPath;
+}
+
+}
+}