Update how we package skia resource for android testing

platform_tools/android/tests/expectations/tool/Android.mk

Index: platform_tools/android/tests/expectations/tool/Android.mk
diff --git a/platform_tools/android/tests/expectations/tool/Android.mk b/platform_tools/android/tests/expectations/tool/Android.mk
index 8c0389d483fe2d29e1ebae6d99735b216416ae63..b5ecbe4195345f0fc2c87ae780ff0237bd22ddf9 100644
--- a/platform_tools/android/tests/expectations/tool/Android.mk
+++ b/platform_tools/android/tests/expectations/tool/Android.mk
@@ -40,12 +40,9 @@ LOCAL_MODULE := \
 	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 :=
-
+# Store skia's resources in the directory structure that the Android testing
+# infrastructure expects.  This requires that Skia maintain a symlinked
+# subdirectory in the DATA folder that points to the top level skia resources...
+#  i.e. external/skia/DATA/skia_resources --> ../resources
+LOCAL_PICKUP_FILES := $(LOCAL_PATH)/../DATA
 include $(BUILD_NATIVE_TEST)