diff --git a/README.android b/README.android
new file mode 100644
index 0000000..fece98e
--- /dev/null
+++ b/README.android
@@ -0,0 +1,13 @@
+The Skia library is a cross-platform 2D-based renderer. The
+key places to look are in the folders:
+
+  include/  : contains public header files
+  src/      : contains src code
+
+The top level makefile is at the root: Android.mk
+
+These files originate from an upstream repository
+(skia.googlesource.com) where the project is actively developed
+and maintained. As a result some files are not relevant to
+Android, but make the merging process smoother.
+
diff --git a/bench/Android.mk b/bench/Android.mk
index b40fee2..d6ac6ae 100644
--- a/bench/Android.mk
+++ b/bench/Android.mk
@@ -408,10 +408,6 @@
 
 # Setup directory to store skia's resources in the directory structure that
 # the Android testing infrastructure expects
-skia_res_dir := $(call intermediates-dir-for,PACKAGING,skia_resources)/DATA
-$(shell mkdir -p $(skia_res_dir))
-$(shell cp -r $(LOCAL_PATH)/../resources/. $(skia_res_dir)/skia_resources)
-LOCAL_PICKUP_FILES := $(skia_res_dir)
-skia_res_dir :=
+LOCAL_PICKUP_FILES := $(LOCAL_PATH)/DATA
 
 include $(BUILD_NATIVE_TEST)
diff --git a/bench/DATA/skia_resources b/bench/DATA/skia_resources
new file mode 120000
index 0000000..81bd1c5
--- /dev/null
+++ b/bench/DATA/skia_resources
@@ -0,0 +1 @@
+../../resources/
\ No newline at end of file
diff --git a/dm/Android.mk b/dm/Android.mk
index 66e609e..704c4cb 100644
--- a/dm/Android.mk
+++ b/dm/Android.mk
@@ -576,10 +576,6 @@
 
 # Setup directory to store skia's resources in the directory structure that
 # the Android testing infrastructure expects
-skia_res_dir := $(call intermediates-dir-for,PACKAGING,skia_resources)/DATA
-$(shell mkdir -p $(skia_res_dir))
-$(shell cp -r $(LOCAL_PATH)/../resources/. $(skia_res_dir)/skia_resources)
-LOCAL_PICKUP_FILES := $(skia_res_dir)
-skia_res_dir :=
+LOCAL_PICKUP_FILES := $(LOCAL_PATH)/DATA
 
 include $(BUILD_NATIVE_TEST)
diff --git a/dm/DATA/skia_resources b/dm/DATA/skia_resources
new file mode 120000
index 0000000..81bd1c5
--- /dev/null
+++ b/dm/DATA/skia_resources
@@ -0,0 +1 @@
+../../resources/
\ No newline at end of file
diff --git a/gm/DATA/skia_resources b/gm/DATA/skia_resources
new file mode 120000
index 0000000..81bd1c5
--- /dev/null
+++ b/gm/DATA/skia_resources
@@ -0,0 +1 @@
+../../resources/
\ No newline at end of file
diff --git a/platform_tools/android/bin/android_gdbserver b/platform_tools/android/bin/android_gdbserver
index f3ee6b9..755b51e 100755
--- a/platform_tools/android/bin/android_gdbserver
+++ b/platform_tools/android/bin/android_gdbserver
@@ -41,7 +41,7 @@
     libunwind-ptrace.so \
     libbacktrace.so \
     libutils.so \
-    libstlport.so \
+    libc++.so \
     libGLES_trace.so \
     libEGL.so \
     libGLESv2.so \
diff --git a/platform_tools/android/tests/expectations/tool/Android.mk b/platform_tools/android/tests/expectations/tool/Android.mk
index 8c0389d..9bb61ed 100644
--- a/platform_tools/android/tests/expectations/tool/Android.mk
+++ b/platform_tools/android/tests/expectations/tool/Android.mk
@@ -40,12 +40,4 @@
 	local_module
 
 
-# Setup directory to store skia's resources in the directory structure that
-# the Android testing infrastructure expects
-skia_res_dir := $(call intermediates-dir-for,PACKAGING,skia_resources)/DATA
-$(shell mkdir -p $(skia_res_dir))
-$(shell cp -r $(LOCAL_PATH)/../resources/. $(skia_res_dir)/skia_resources)
-LOCAL_PICKUP_FILES := $(skia_res_dir)
-skia_res_dir :=
-
 include $(BUILD_NATIVE_TEST)
diff --git a/src/utils/android/SkHwuiRenderer.cpp b/src/utils/android/SkHwuiRenderer.cpp
index 17a830e..70b7e5b 100644
--- a/src/utils/android/SkHwuiRenderer.cpp
+++ b/src/utils/android/SkHwuiRenderer.cpp
@@ -54,8 +54,9 @@
     this->proxy->initialize(this->androidSurface.get());
     float lightX = size.width() / 2.0f;
     android::uirenderer::Vector3 lightVector { lightX, -200.0f, 800.0f };
-    this->proxy->setup(size.width(), size.height(), lightVector, 800.0f,
+    this->proxy->setup(size.width(), size.height(), 800.0f,
                          255 * 0.075f, 255 * 0.15f);
+    this->proxy->setLightCenter(lightVector);
     this->canvas.reset(new android::uirenderer::DisplayListCanvas());
     this->canvas->setViewport(size.width(), size.height());
 }