234 files changed, 16 insertions, 17 deletions

diff --git a/Makefile b/Makefile
index 9f727abc2a..44fdbd5678 100644
--- a/Makefile
+++ b/Makefile
@@ -72,13 +72,13 @@ android-lib: ; $(RUN) HOST=android Makefile/androidapp
 
 # Builds the selected/default Android library
 android: android-lib
-	cd android/java && ./gradlew --parallel --max-workers=$(JOBS) assemble$(BUILDTYPE)
+	cd android && ./gradlew --parallel --max-workers=$(JOBS) assemble$(BUILDTYPE)
 
 # Builds all android architectures for distribution.
 apackage: android-lib-arm-v5 android-lib-arm-v7
 apackage: android-lib-x86
 apackage: android-lib-mips
-	cd android/java && ./gradlew --parallel-threads=$(JOBS) assemble$(BUILDTYPE)
+	cd android && ./gradlew --parallel-threads=$(JOBS) assemble$(BUILDTYPE)
 
 # Builds the Node.js library
 .PHONY: node
@@ -130,9 +130,8 @@ clean: clear_sqlite_cache clear_xcode_cache
 	-rm -rf ./ios/build
 	-rm -rf ./test/build
 	-rm -rf ./config/*.gypi
-	-rm -rf ./android/java/build ./android/java/MapboxGLAndroidSDK/build ./android/java/MapboxGLAndroidSDKTestApp/build
-	-rm -rf ./android/java/MapboxGLAndroidSDK/src/main/jniLibs ./android/java/MapboxGLAndroidSDK/src/main/obj.target ./android/java/MapboxGLAndroidSDK/src/main/assets
-	-rm -f ./android/test/features.zip
+	-rm -rf ./android/build ./android/MapboxGLAndroidSDK/build ./android/MapboxGLAndroidSDKTestApp/build
+	-rm -rf ./android/MapboxGLAndroidSDK/src/main/jniLibs ./android/MapboxGLAndroidSDK/src/main/obj.target ./android/MapboxGLAndroidSDK/src/main/assets
 
 distclean: clean
 	-rm -rf ./mason_packages
diff --git a/android/java/.gitignore b/android/.gitignore
index 173ce20c94..173ce20c94 100644
--- a/android/java/.gitignore
+++ b/android/.gitignore
diff --git a/android/java/MapboxGLAndroidSDK/build.gradle b/android/MapboxGLAndroidSDK/build.gradle
index 7ff49e594e..7ff49e594e 100644
--- a/android/java/MapboxGLAndroidSDK/build.gradle
+++ b/android/MapboxGLAndroidSDK/build.gradle
diff --git a/android/java/MapboxGLAndroidSDK/deploy.sh b/android/MapboxGLAndroidSDK/deploy.sh
index c9392201e4..c9392201e4 100755
--- a/android/java/MapboxGLAndroidSDK/deploy.sh
+++ b/android/MapboxGLAndroidSDK/deploy.sh
diff --git a/android/java/MapboxGLAndroidSDK/gradle.properties b/android/MapboxGLAndroidSDK/gradle.properties
index 1bbc801e48..1bbc801e48 100644
--- a/android/java/MapboxGLAndroidSDK/gradle.properties
+++ b/android/MapboxGLAndroidSDK/gradle.properties
diff --git a/android/java/MapboxGLAndroidSDK/lint.xml b/android/MapboxGLAndroidSDK/lint.xml
index 3a244199a7..3a244199a7 100644
--- a/android/java/MapboxGLAndroidSDK/lint.xml
+++ b/android/MapboxGLAndroidSDK/lint.xml
diff --git a/android/java/MapboxGLAndroidSDK/proguard-rules.pro b/android/MapboxGLAndroidSDK/proguard-rules.pro
index 6853f3ddea..6853f3ddea 100644
--- a/android/java/MapboxGLAndroidSDK/proguard-rules.pro
+++ b/android/MapboxGLAndroidSDK/proguard-rules.pro
diff --git a/android/java/MapboxGLAndroidSDK/src/main/AndroidManifest.xml b/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml
index 1b8b54c86f..1b8b54c86f 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/AndroidManifest.xml
+++ b/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/BaseGestureDetector.java b/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/BaseGestureDetector.java
index 622e8f759c..622e8f759c 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/BaseGestureDetector.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/BaseGestureDetector.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/MoveGestureDetector.java b/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/MoveGestureDetector.java
index 2430f3f920..2430f3f920 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/MoveGestureDetector.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/MoveGestureDetector.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/RotateGestureDetector.java b/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/RotateGestureDetector.java
index 124fe8509c..124fe8509c 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/RotateGestureDetector.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/RotateGestureDetector.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/ShoveGestureDetector.java b/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/ShoveGestureDetector.java
index 254597105b..254597105b 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/ShoveGestureDetector.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/ShoveGestureDetector.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/TwoFingerGestureDetector.java b/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/TwoFingerGestureDetector.java
index 91e5ef13c8..91e5ef13c8 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/TwoFingerGestureDetector.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/TwoFingerGestureDetector.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/package-info.java b/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/package-info.java
index abc0a11892..abc0a11892 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/package-info.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/package-info.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapFragment.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapFragment.java
index 92405dc5cc..92405dc5cc 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapFragment.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapFragment.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java
index a83079ac41..a83079ac41 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java
index 799d01d5c0..799d01d5c0 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowTipView.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowTipView.java
index 106e11820a..106e11820a 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowTipView.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowTipView.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowView.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowView.java
index 9b0a339252..9b0a339252 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowView.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowView.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java
index 4f43f9bfa2..4f43f9bfa2 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java
index f0c15906e0..f0c15906e0 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MultiPoint.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MultiPoint.java
index 5c1dfb119f..5c1dfb119f 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MultiPoint.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MultiPoint.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java
index 32258943ab..32258943ab 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java
index 42e80edc2c..42e80edc2c 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java
index 331974c9c6..331974c9c6 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java
index 089646696d..089646696d 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Sprite.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Sprite.java
index 597c196d2a..597c196d2a 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Sprite.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Sprite.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/SpriteFactory.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/SpriteFactory.java
index 78f7673f89..78f7673f89 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/SpriteFactory.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/SpriteFactory.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/package-info.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/package-info.java
index 575d10c564..575d10c564 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/package-info.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/package-info.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/GeoConstants.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/GeoConstants.java
index 9e6812eb6b..9e6812eb6b 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/GeoConstants.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/GeoConstants.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java
index 3cd542bb17..3cd542bb17 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MathConstants.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MathConstants.java
index a875fada22..a875fada22 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MathConstants.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MathConstants.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java
index e2dad97832..e2dad97832 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/package-info.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/package-info.java
index b99119db0a..b99119db0a 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/package-info.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/package-info.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidAccessTokenException.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidAccessTokenException.java
index af5a8525a5..af5a8525a5 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidAccessTokenException.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidAccessTokenException.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/SpriteBitmapChangedException.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/SpriteBitmapChangedException.java
index 15c6d7eec6..15c6d7eec6 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/SpriteBitmapChangedException.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/SpriteBitmapChangedException.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/TooManySpritesException.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/TooManySpritesException.java
index 02a57ba225..02a57ba225 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/TooManySpritesException.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/TooManySpritesException.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/package-info.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/package-info.java
index d593884ee3..d593884ee3 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/package-info.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/package-info.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/BoundingBox.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/BoundingBox.java
index e778e30aad..e778e30aad 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/BoundingBox.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/BoundingBox.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateBounds.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateBounds.java
index e5b4b2fdcc..e5b4b2fdcc 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateBounds.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateBounds.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateRegion.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateRegion.java
index a70bb05a41..a70bb05a41 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateRegion.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateRegion.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateSpan.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateSpan.java
index 79361f725a..79361f725a 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateSpan.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateSpan.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ILatLng.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ILatLng.java
index 892d0ad4ae..892d0ad4ae 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ILatLng.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ILatLng.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/IProjectedMeters.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/IProjectedMeters.java
index 5aa5f607eb..5aa5f607eb 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/IProjectedMeters.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/IProjectedMeters.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java
index b2a0a02b15..b2a0a02b15 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngZoom.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngZoom.java
index 9e453a391c..9e453a391c 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngZoom.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngZoom.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java
index be4819a74e..be4819a74e 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/package-info.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/package-info.java
index bf7dae12a8..bf7dae12a8 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/package-info.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/package-info.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPContext.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPContext.java
index 358af8997c..358af8997c 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPContext.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPContext.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/package-info.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/package-info.java
index a5dbf30463..a5dbf30463 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/package-info.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/package-info.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/package-info.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/package-info.java
index 474a554463..474a554463 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/package-info.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/package-info.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ApiAccess.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ApiAccess.java
index 354bb01855..354bb01855 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ApiAccess.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ApiAccess.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/package-info.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/package-info.java
index 9d9c0bf4bb..9d9c0bf4bb 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/package-info.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/package-info.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/CompassView.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/CompassView.java
index 174f949916..174f949916 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/CompassView.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/CompassView.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java
index e3c3599b68..e3c3599b68 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java
index da13efcf87..da13efcf87 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/UserLocationView.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/UserLocationView.java
index 7453f4e28c..7453f4e28c 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/UserLocationView.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/UserLocationView.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/package-info.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/package-info.java
index a17f268c01..a17f268c01 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/package-info.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/package-info.java
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/overview.html b/android/MapboxGLAndroidSDK/src/main/java/overview.html
index 951b8d8e75..951b8d8e75 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/overview.html
+++ b/android/MapboxGLAndroidSDK/src/main/java/overview.html
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res-public/values/public.xml b/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml
index 09dee3752a..09dee3752a 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res-public/values/public.xml
+++ b/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/color/material_bg_selector.xml b/android/MapboxGLAndroidSDK/src/main/res/color/material_bg_selector.xml
index 64d7f46c2d..64d7f46c2d 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/color/material_bg_selector.xml
+++ b/android/MapboxGLAndroidSDK/src/main/res/color/material_bg_selector.xml
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_logo.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_logo.png
index c0f4ed2c4c..c0f4ed2c4c 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_logo.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_logo.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/compass.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/compass.png
index 6bb20027f4..6bb20027f4 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/compass.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/compass.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/default_marker.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/default_marker.png
index 8b0af4c6ab..8b0af4c6ab 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/default_marker.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/default_marker.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_blue_normal.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_blue_normal.png
index de44e3ddc0..de44e3ddc0 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_blue_normal.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_blue_normal.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_blue_pressed.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_blue_pressed.png
index fa26786242..fa26786242 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_blue_pressed.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_blue_pressed.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/user_location.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/user_location.png
index 1ae8d541af..1ae8d541af 100755
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/user_location.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/user_location.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/user_location_bearing.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/user_location_bearing.png
index 8ecaffa2e8..8ecaffa2e8 100755
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/user_location_bearing.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/user_location_bearing.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/user_location_stale.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/user_location_stale.png
index 0d599c01fa..0d599c01fa 100755
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/user_location_stale.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/user_location_stale.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_logo.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_logo.png
index 5a9da3fe39..5a9da3fe39 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_logo.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_logo.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/compass.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/compass.png
index cf15ed1876..cf15ed1876 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/compass.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/compass.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/default_marker.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/default_marker.png
index b112096c18..b112096c18 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/default_marker.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/default_marker.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_blue_normal.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_blue_normal.png
index dd50478ac1..dd50478ac1 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_blue_normal.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_blue_normal.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_blue_pressed.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_blue_pressed.png
index d377f3cb8c..d377f3cb8c 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_blue_pressed.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_blue_pressed.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/user_location.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/user_location.png
index 542cd25e22..542cd25e22 100755
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/user_location.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/user_location.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/user_location_bearing.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/user_location_bearing.png
index 429f03f648..429f03f648 100755
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/user_location_bearing.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/user_location_bearing.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/user_location_stale.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/user_location_stale.png
index 6613c41153..6613c41153 100755
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/user_location_stale.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/user_location_stale.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_logo.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_logo.png
index 194aa64da2..194aa64da2 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_logo.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_logo.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/compass.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/compass.png
index 6257209368..6257209368 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/compass.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/compass.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/default_marker.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/default_marker.png
index d05c82bfe2..d05c82bfe2 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/default_marker.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/default_marker.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_blue_normal.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_blue_normal.png
index df7d7a8875..df7d7a8875 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_blue_normal.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_blue_normal.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_blue_pressed.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_blue_pressed.png
index f5b1833641..f5b1833641 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_blue_pressed.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_blue_pressed.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/user_location.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/user_location.png
index ca1f1fe630..ca1f1fe630 100755
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/user_location.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/user_location.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/user_location_bearing.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/user_location_bearing.png
index 1b88f9f489..1b88f9f489 100755
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/user_location_bearing.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/user_location_bearing.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/user_location_stale.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/user_location_stale.png
index 7af3789ff0..7af3789ff0 100755
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/user_location_stale.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/user_location_stale.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_logo.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_logo.png
index d1260a16f3..d1260a16f3 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_logo.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_logo.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/compass.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/compass.png
index c59b4c7528..c59b4c7528 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/compass.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/compass.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/default_marker.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/default_marker.png
index 703b172c15..703b172c15 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/default_marker.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/default_marker.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_blue_normal.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_blue_normal.png
index 0a04d4eaad..0a04d4eaad 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_blue_normal.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_blue_normal.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_blue_pressed.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_blue_pressed.png
index faaef0625d..faaef0625d 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_blue_pressed.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_blue_pressed.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/user_location.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/user_location.png
index 6f175df168..6f175df168 100755
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/user_location.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/user_location.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/user_location_bearing.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/user_location_bearing.png
index f4bb454a06..f4bb454a06 100755
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/user_location_bearing.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/user_location_bearing.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/user_location_stale.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/user_location_stale.png
index f1d2f2eca0..f1d2f2eca0 100755
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/user_location_stale.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/user_location_stale.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_logo.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_logo.png
index 5f9647610a..5f9647610a 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_logo.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_logo.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/compass.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/compass.png
index da04f5b94c..da04f5b94c 100755
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/compass.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/compass.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/default_marker.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/default_marker.png
index 8331ffef71..8331ffef71 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/default_marker.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/default_marker.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_blue_normal.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_blue_normal.png
index bcee96deaa..bcee96deaa 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_blue_normal.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_blue_normal.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_blue_pressed.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_blue_pressed.png
index 781263f760..781263f760 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_blue_pressed.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_blue_pressed.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/user_location.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/user_location.png
index d43541ac3c..d43541ac3c 100755
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/user_location.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/user_location.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/user_location_bearing.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/user_location_bearing.png
index a8cccbb3e2..a8cccbb3e2 100755
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/user_location_bearing.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/user_location_bearing.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/user_location_stale.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/user_location_stale.png
index 33e952391f..33e952391f 100755
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/user_location_stale.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/user_location_stale.png
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_selector.xml b/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_selector.xml
index 9f550f66d5..9f550f66d5 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_selector.xml
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_selector.xml
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/layout/attribution_list_item.xml b/android/MapboxGLAndroidSDK/src/main/res/layout/attribution_list_item.xml
index 1252fb194f..1252fb194f 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/layout/attribution_list_item.xml
+++ b/android/MapboxGLAndroidSDK/src/main/res/layout/attribution_list_item.xml
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/layout/infowindow_content.xml b/android/MapboxGLAndroidSDK/src/main/res/layout/infowindow_content.xml
index 496766ea77..496766ea77 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/layout/infowindow_content.xml
+++ b/android/MapboxGLAndroidSDK/src/main/res/layout/infowindow_content.xml
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/layout/infowindow_view.xml b/android/MapboxGLAndroidSDK/src/main/res/layout/infowindow_view.xml
index ff47642426..ff47642426 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/layout/infowindow_view.xml
+++ b/android/MapboxGLAndroidSDK/src/main/res/layout/infowindow_view.xml
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/layout/mapview.xml b/android/MapboxGLAndroidSDK/src/main/res/layout/mapview.xml
index 22afd6e513..22afd6e513 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/layout/mapview.xml
+++ b/android/MapboxGLAndroidSDK/src/main/res/layout/mapview.xml
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/raw/token.txt b/android/MapboxGLAndroidSDK/src/main/res/raw/token.txt
index ec747fa47d..ec747fa47d 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/raw/token.txt
+++ b/android/MapboxGLAndroidSDK/src/main/res/raw/token.txt
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/values/arrays.xml b/android/MapboxGLAndroidSDK/src/main/res/values/arrays.xml
index 2c1fdf8d13..2c1fdf8d13 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/values/arrays.xml
+++ b/android/MapboxGLAndroidSDK/src/main/res/values/arrays.xml
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/values/attrs.xml b/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml
index be946714d6..be946714d6 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/values/attrs.xml
+++ b/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/values/colors.xml b/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml
index bb1c326a89..bb1c326a89 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/values/colors.xml
+++ b/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/values/dimens.xml b/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml
index 0881220060..0881220060 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/values/dimens.xml
+++ b/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/values/strings.xml b/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml
index 0de0715be6..0de0715be6 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/values/strings.xml
+++ b/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/values/styles.xml b/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml
index 9ad12f76ad..9ad12f76ad 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/values/styles.xml
+++ b/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml
diff --git a/android/java/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties b/android/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties
index e17088dfdd..e17088dfdd 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties
+++ b/android/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties
diff --git a/android/java/MapboxGLAndroidSDKTestApp/README.md b/android/MapboxGLAndroidSDKTestApp/README.md
index 646f29c4b4..646f29c4b4 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/README.md
+++ b/android/MapboxGLAndroidSDKTestApp/README.md
diff --git a/android/java/MapboxGLAndroidSDKTestApp/build.gradle b/android/MapboxGLAndroidSDKTestApp/build.gradle
index a220252fa4..a220252fa4 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/build.gradle
+++ b/android/MapboxGLAndroidSDKTestApp/build.gradle
diff --git a/android/java/MapboxGLAndroidSDKTestApp/lint.xml b/android/MapboxGLAndroidSDKTestApp/lint.xml
index 94058fd4df..94058fd4df 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/lint.xml
+++ b/android/MapboxGLAndroidSDKTestApp/lint.xml
diff --git a/android/java/MapboxGLAndroidSDKTestApp/proguard-rules.pro b/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro
index 578d946927..578d946927 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/proguard-rules.pro
+++ b/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BaseTest.java b/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BaseTest.java
index e432d5f576..e432d5f576 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BaseTest.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BaseTest.java
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivityTest.java b/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivityTest.java
index d66ae8f514..d66ae8f514 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivityTest.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivityTest.java
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowActivityTest.java b/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowActivityTest.java
index 9fb99fe262..9fb99fe262 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowActivityTest.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowActivityTest.java
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivityTest.java b/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivityTest.java
index 51bd163fc1..51bd163fc1 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivityTest.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivityTest.java
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityScreenTest.java b/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityScreenTest.java
index bbfa4ec73a..bbfa4ec73a 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityScreenTest.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityScreenTest.java
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityTest.java b/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityTest.java
index c545bc118b..c545bc118b 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityTest.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityTest.java
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivityTest.java b/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivityTest.java
index e65860f4b2..e65860f4b2 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivityTest.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivityTest.java
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivityTest.java b/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivityTest.java
index ccb8354fc5..ccb8354fc5 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivityTest.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivityTest.java
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/VisibleCoordinateBoundsActivityTest.java b/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/VisibleCoordinateBoundsActivityTest.java
index 29ed3fa53a..29ed3fa53a 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/VisibleCoordinateBoundsActivityTest.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/VisibleCoordinateBoundsActivityTest.java
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/ScreenshotUtil.java b/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/ScreenshotUtil.java
index d25afec815..d25afec815 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/ScreenshotUtil.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/ScreenshotUtil.java
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
index 846a19ed88..846a19ed88 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/assets/dog-park-24.png b/android/MapboxGLAndroidSDKTestApp/src/main/assets/dog-park-24.png
index 235f4b4d34..235f4b4d34 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/assets/dog-park-24.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/assets/dog-park-24.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/assets/points.geojson b/android/MapboxGLAndroidSDKTestApp/src/main/assets/points.geojson
index a34f53bd36..a34f53bd36 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/assets/points.geojson
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/assets/points.geojson
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/assets/small_line.geojson b/android/MapboxGLAndroidSDKTestApp/src/main/assets/small_line.geojson
index ef76eaf56d..ef76eaf56d 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/assets/small_line.geojson
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/assets/small_line.geojson
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/assets/small_poly.geojson b/android/MapboxGLAndroidSDKTestApp/src/main/assets/small_poly.geojson
index ec61303c72..ec61303c72 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/assets/small_poly.geojson
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/assets/small_poly.geojson
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivity.java b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivity.java
index 3bddf4e32e..3bddf4e32e 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivity.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivity.java
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowActivity.java b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowActivity.java
index f53f923b0e..f53f923b0e 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowActivity.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowActivity.java
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivity.java b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivity.java
index 0a489edaa1..0a489edaa1 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivity.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivity.java
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java
index 50c70b5f5e..50c70b5f5e 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivity.java b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivity.java
index 2eadedca2a..2eadedca2a 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivity.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivity.java
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivity.java b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivity.java
index b24ef84cad..b24ef84cad 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivity.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivity.java
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/TimingLogger.java b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/TimingLogger.java
index de8c4df303..de8c4df303 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/TimingLogger.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/TimingLogger.java
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/Util.java b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/Util.java
index 4e4618cd28..4e4618cd28 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/Util.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/Util.java
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/VisibleCoordinateBoundsActivity.java b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/VisibleCoordinateBoundsActivity.java
index 413acf9328..413acf9328 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/VisibleCoordinateBoundsActivity.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/VisibleCoordinateBoundsActivity.java
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_blur_on_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_blur_on_white_24dp.png
index 3b450909f7..3b450909f7 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_blur_on_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_blur_on_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_crop_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_crop_white_24dp.png
index 9bfca35815..9bfca35815 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_crop_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_crop_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_filter_none_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_filter_none_white_24dp.png
index 3d01316bb4..3d01316bb4 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_filter_none_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_filter_none_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_flip_to_back_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_flip_to_back_white_24dp.png
index 59a66c164d..59a66c164d 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_flip_to_back_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_flip_to_back_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_flip_to_front_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_flip_to_front_white_24dp.png
index 5ee83ad6bb..5ee83ad6bb 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_flip_to_front_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_flip_to_front_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_location_city_black_48dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_location_city_black_48dp.png
index c542d2aa76..c542d2aa76 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_location_city_black_48dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_location_city_black_48dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_menu.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_menu.png
index 8962cbd91f..8962cbd91f 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_menu.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_menu.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_my_location_black_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_my_location_black_24dp.png
index 85e38726dd..85e38726dd 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_my_location_black_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_my_location_black_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_pin_drop_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_pin_drop_white_24dp.png
index d545f6f157..d545f6f157 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_pin_drop_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_pin_drop_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_widgets_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_widgets_white_24dp.png
index 81c6a155b3..81c6a155b3 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_widgets_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_widgets_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon.png
index f9875161da..f9875161da 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon_burned.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon_burned.png
index f9875161da..f9875161da 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon_burned.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon_burned.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_blur_on_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_blur_on_white_24dp.png
index 07a55769b8..07a55769b8 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_blur_on_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_blur_on_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_crop_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_crop_white_24dp.png
index 8e78d8e9e4..8e78d8e9e4 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_crop_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_crop_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_filter_none_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_filter_none_white_24dp.png
index 037f444f4c..037f444f4c 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_filter_none_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_filter_none_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_flip_to_back_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_flip_to_back_white_24dp.png
index ddae8520f8..ddae8520f8 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_flip_to_back_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_flip_to_back_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_flip_to_front_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_flip_to_front_white_24dp.png
index 9a178ebd28..9a178ebd28 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_flip_to_front_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_flip_to_front_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_location_city_black_48dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_location_city_black_48dp.png
index 06853dd255..06853dd255 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_location_city_black_48dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_location_city_black_48dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_menu.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_menu.png
index c62db8c865..c62db8c865 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_menu.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_menu.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_my_location_black_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_my_location_black_24dp.png
index 5684aa7dc5..5684aa7dc5 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_my_location_black_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_my_location_black_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_pin_drop_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_pin_drop_white_24dp.png
index 523fd09996..523fd09996 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_pin_drop_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_pin_drop_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_widgets_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_widgets_white_24dp.png
index 9b8c1c57ba..9b8c1c57ba 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_widgets_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_widgets_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon.png
index 3c0cc701a0..3c0cc701a0 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon_burned.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon_burned.png
index 3c0cc701a0..3c0cc701a0 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon_burned.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon_burned.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_blur_on_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_blur_on_white_24dp.png
index e3517362e4..e3517362e4 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_blur_on_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_blur_on_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_crop_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_crop_white_24dp.png
index 859cdf78bb..859cdf78bb 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_crop_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_crop_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_filter_none_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_filter_none_white_24dp.png
index f4e8257672..f4e8257672 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_filter_none_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_filter_none_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_flip_to_back_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_flip_to_back_white_24dp.png
index e5629e54ac..e5629e54ac 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_flip_to_back_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_flip_to_back_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_flip_to_front_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_flip_to_front_white_24dp.png
index f396bda878..f396bda878 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_flip_to_front_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_flip_to_front_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_location_city_black_48dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_location_city_black_48dp.png
index 5b5fd9a19d..5b5fd9a19d 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_location_city_black_48dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_location_city_black_48dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_menu.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_menu.png
index 36859f094a..36859f094a 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_menu.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_menu.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_my_location_black_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_my_location_black_24dp.png
index 7faa3455f6..7faa3455f6 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_my_location_black_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_my_location_black_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_pin_drop_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_pin_drop_white_24dp.png
index 5cebaab818..5cebaab818 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_pin_drop_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_pin_drop_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_widgets_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_widgets_white_24dp.png
index d1aad0bd12..d1aad0bd12 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_widgets_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_widgets_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon.png
index 0cbf599362..0cbf599362 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon_burned.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon_burned.png
index 0cbf599362..0cbf599362 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon_burned.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon_burned.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_blur_on_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_blur_on_white_24dp.png
index d465660d97..d465660d97 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_blur_on_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_blur_on_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_crop_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_crop_white_24dp.png
index c0246cf2a6..c0246cf2a6 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_crop_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_crop_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_filter_none_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_filter_none_white_24dp.png
index 45fd67df58..45fd67df58 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_filter_none_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_filter_none_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_flip_to_back_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_flip_to_back_white_24dp.png
index f4717be70d..f4717be70d 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_flip_to_back_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_flip_to_back_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_flip_to_front_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_flip_to_front_white_24dp.png
index 9b78ad3780..9b78ad3780 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_flip_to_front_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_flip_to_front_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_location_city_black_48dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_location_city_black_48dp.png
index 0b2b64745d..0b2b64745d 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_location_city_black_48dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_location_city_black_48dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_menu.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_menu.png
index 1a5109828f..1a5109828f 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_menu.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_menu.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_my_location_black_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_my_location_black_24dp.png
index d3a1ab08c8..d3a1ab08c8 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_my_location_black_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_my_location_black_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_pin_drop_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_pin_drop_white_24dp.png
index abd6966825..abd6966825 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_pin_drop_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_pin_drop_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_widgets_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_widgets_white_24dp.png
index fd21e813e2..fd21e813e2 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_widgets_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_widgets_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon.png
index 6ac3191ebf..6ac3191ebf 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon_burned.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon_burned.png
index 6ac3191ebf..6ac3191ebf 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon_burned.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon_burned.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_blur_on_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_blur_on_white_24dp.png
index 3690a1d045..3690a1d045 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_blur_on_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_blur_on_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_crop_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_crop_white_24dp.png
index 3c027ef29c..3c027ef29c 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_crop_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_crop_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_filter_none_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_filter_none_white_24dp.png
index 8102725a5e..8102725a5e 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_filter_none_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_filter_none_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_flip_to_back_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_flip_to_back_white_24dp.png
index 7c3d8d3669..7c3d8d3669 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_flip_to_back_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_flip_to_back_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_flip_to_front_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_flip_to_front_white_24dp.png
index d07d0ca9ab..d07d0ca9ab 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_flip_to_front_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_flip_to_front_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_location_city_black_48dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_location_city_black_48dp.png
index f9654a9a67..f9654a9a67 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_location_city_black_48dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_location_city_black_48dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_menu.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_menu.png
index c15d634671..c15d634671 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_menu.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_menu.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_my_location_black_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_my_location_black_24dp.png
index 0812b0e31d..0812b0e31d 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_my_location_black_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_my_location_black_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_pin_drop_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_pin_drop_white_24dp.png
index 09dc9a6813..09dc9a6813 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_pin_drop_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_pin_drop_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_widgets_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_widgets_white_24dp.png
index 00806a2fa3..00806a2fa3 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_widgets_white_24dp.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_widgets_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon.png
index 987e6b0247..987e6b0247 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon_burned.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon_burned.png
index 987e6b0247..987e6b0247 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon_burned.png
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon_burned.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml
index b84f05143d..b84f05143d 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml
index 371219cb5d..371219cb5d 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml
index b97fb4fcae..b97fb4fcae 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml
index 77afd256a2..77afd256a2 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml
index 40216524e0..40216524e0 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml
index 8dfa1943c9..8dfa1943c9 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_visible_bounds.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_visible_bounds.xml
index 5b5d5d2fa0..5b5d5d2fa0 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_visible_bounds.xml
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_visible_bounds.xml
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
index 5167182a44..5167182a44 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_main.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_main.xml
index 2c5178af08..2c5178af08 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_main.xml
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_main.xml
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml
index ac3b4fc30d..ac3b4fc30d 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml
index ec0e973cb8..ec0e973cb8 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
index 94c089146a..94c089146a 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml
index 9248bc7d00..9248bc7d00 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/test/java/BoundingBoxTest.java b/android/MapboxGLAndroidSDKTestApp/src/test/java/BoundingBoxTest.java
index f03766c9e5..f03766c9e5 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/test/java/BoundingBoxTest.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/test/java/BoundingBoxTest.java
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/test/java/CoordinateBoundsTest.java b/android/MapboxGLAndroidSDKTestApp/src/test/java/CoordinateBoundsTest.java
index a5d3891305..a5d3891305 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/test/java/CoordinateBoundsTest.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/test/java/CoordinateBoundsTest.java
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/test/java/CoordinateRegionTest.java b/android/MapboxGLAndroidSDKTestApp/src/test/java/CoordinateRegionTest.java
index 4690bd719b..4690bd719b 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/test/java/CoordinateRegionTest.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/test/java/CoordinateRegionTest.java
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/test/java/CoordinateSpanTest.java b/android/MapboxGLAndroidSDKTestApp/src/test/java/CoordinateSpanTest.java
index ef10c5bed1..ef10c5bed1 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/test/java/CoordinateSpanTest.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/test/java/CoordinateSpanTest.java
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/test/java/LatLngTest.java b/android/MapboxGLAndroidSDKTestApp/src/test/java/LatLngTest.java
index dd075f327f..dd075f327f 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/test/java/LatLngTest.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/test/java/LatLngTest.java
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/test/java/LatLngZoomTest.java b/android/MapboxGLAndroidSDKTestApp/src/test/java/LatLngZoomTest.java
index 5aa42459fb..5aa42459fb 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/test/java/LatLngZoomTest.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/test/java/LatLngZoomTest.java
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/test/java/ProjectedMetersTest.java b/android/MapboxGLAndroidSDKTestApp/src/test/java/ProjectedMetersTest.java
index c79d2dfe3e..c79d2dfe3e 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/test/java/ProjectedMetersTest.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/test/java/ProjectedMetersTest.java
diff --git a/android/java/build.gradle b/android/build.gradle
index 4093fc84b2..4093fc84b2 100644
--- a/android/java/build.gradle
+++ b/android/build.gradle
diff --git a/android/java/checks.xml b/android/checks.xml
index 0ee2716786..0ee2716786 100644
--- a/android/java/checks.xml
+++ b/android/checks.xml
diff --git a/android/java/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
index 30d399d8d2..30d399d8d2 100644
--- a/android/java/gradle/wrapper/gradle-wrapper.jar
+++ b/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/java/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 3212d53fb2..3212d53fb2 100644
--- a/android/java/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
diff --git a/android/java/gradlew b/android/gradlew
index 91a7e269e1..91a7e269e1 100755
--- a/android/java/gradlew
+++ b/android/gradlew
diff --git a/android/java/gradlew.bat b/android/gradlew.bat
index 8a0b282aa6..8a0b282aa6 100644
--- a/android/java/gradlew.bat
+++ b/android/gradlew.bat
diff --git a/android/java/settings.gradle b/android/settings.gradle
index 71a8f1a9ad..71a8f1a9ad 100644
--- a/android/java/settings.gradle
+++ b/android/settings.gradle
diff --git a/gyp/android.gyp b/gyp/android.gyp
index 0a09edb6cd..fbeb4a647b 100644
--- a/gyp/android.gyp
+++ b/gyp/android.gyp
@@ -1,5 +1,5 @@
 {
   'includes': [
-    '../android/mapboxgl-app.gypi',
+    '../platform/android/mapboxgl-app.gypi',
   ],
 }
diff --git a/android/cpp/jni.cpp b/platform/android/jni.cpp
index d0d3ea2970..d0d3ea2970 100644
--- a/android/cpp/jni.cpp
+++ b/platform/android/jni.cpp
diff --git a/android/mapboxgl-app.gypi b/platform/android/mapboxgl-app.gypi
index 9789f57aee..82ed377d31 100644
--- a/android/mapboxgl-app.gypi
+++ b/platform/android/mapboxgl-app.gypi
@@ -1,6 +1,6 @@
 {
   'includes': [
-    '../gyp/common.gypi',
+    '../../gyp/common.gypi',
   ],
   'targets': [
     { 'target_name': 'android-lib',
@@ -17,8 +17,8 @@
       ],
 
       'sources': [
-        './cpp/native_map_view.cpp',
-        './cpp/jni.cpp',
+        './native_map_view.cpp',
+        './jni.cpp',
       ],
 
       'cflags_cc': [
@@ -75,16 +75,16 @@
       'copies': [
         {
           'files': [
-            '../common/ca-bundle.crt',
-            '../styles/styles'
+            '../../common/ca-bundle.crt',
+            '../../styles/styles'
           ],
-          'destination': '<(pwd)/../android/java/MapboxGLAndroidSDK/src/main/assets'
+          'destination': '<(pwd)/../android/MapboxGLAndroidSDK/src/main/assets'
         },
         {
         'files': [
           '<(PRODUCT_DIR)/obj.target'
         ],
-        'destination': '<(pwd)/../android/java/MapboxGLAndroidSDK/src/main'
+        'destination': '<(pwd)/../android/MapboxGLAndroidSDK/src/main'
         },
       ],
 
@@ -92,7 +92,7 @@
         {
           'action_name': 'Strip dynamic library',
           'inputs': [ '<(PRODUCT_DIR)/lib.target/libmapbox-gl.so' ],
-          'outputs': [ '<(pwd)/../android/java/MapboxGLAndroidSDK/src/main/jniLibs/$(JNIDIR)/libmapbox-gl.so' ],
+          'outputs': [ '<(pwd)/../android/MapboxGLAndroidSDK/src/main/jniLibs/$(JNIDIR)/libmapbox-gl.so' ],
           'action': [ '$(STRIP)', '<@(_inputs)', '-o', '<@(_outputs)' ]
         },
       ],
diff --git a/android/cpp/native_map_view.cpp b/platform/android/native_map_view.cpp
index 9c4d4b1d10..9c4d4b1d10 100644
--- a/android/cpp/native_map_view.cpp
+++ b/platform/android/native_map_view.cpp
diff --git a/scripts/android/run.sh b/scripts/android/run.sh
index 73ffc4c5ce..00a12d025f 100755
--- a/scripts/android/run.sh
+++ b/scripts/android/run.sh
@@ -15,8 +15,8 @@ export MASON_ANDROID_ABI=${ANDROID_ABI}
 mapbox_time "checkout_styles" \
 git submodule update --init styles
 
-mkdir -p ./android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw
-echo "${MAPBOX_ACCESS_TOKEN}" > ./android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt
+mkdir -p ./android/MapboxGLAndroidSDKTestApp/src/main/res/raw
+echo "${MAPBOX_ACCESS_TOKEN}" > ./android/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt
 
 mapbox_time "compile_library" \
 make android-lib HOST_VERSION=${ANDROID_ABI} -j${JOBS} BUILDTYPE=${BUILDTYPE}
@@ -38,7 +38,7 @@ if [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then
     echo "Deploying results..."
 
     S3_PREFIX=s3://mapbox/mapbox-gl-native/android/build/${TRAVIS_JOB_NUMBER}
-    APK_OUTPUTS=./android/java/MapboxGLAndroidSDKTestApp/build/outputs/apk
+    APK_OUTPUTS=./android/MapboxGLAndroidSDKTestApp/build/outputs/apk
     JNILIB=`mason env JNIDIR`
 
     # ARM64 does not build APK for now