Update Android framework makefile to build static and shared libs

platform_tools/android/gyp_gen/tool_makefile_writer.py

Index: platform_tools/android/gyp_gen/tool_makefile_writer.py
diff --git a/platform_tools/android/gyp_gen/tool_makefile_writer.py b/platform_tools/android/gyp_gen/tool_makefile_writer.py
index 2fef11009d56b9cc05508170231695e1f5159d85..e6b9a653d0d9c00c2f425427fe1fdfb108ba2b0a 100644
--- a/platform_tools/android/gyp_gen/tool_makefile_writer.py
+++ b/platform_tools/android/gyp_gen/tool_makefile_writer.py
@@ -35,12 +35,13 @@ def write_tool_android_mk(target_dir, var_dict):
   with open(target_file, 'w') as f:
     f.write(makefile_writer.AUTOGEN_WARNING)
 
-    makefile_writer.write_local_path(f)
-    makefile_writer.write_clear_vars(f)
+    f.write('LOCAL_PATH:= $(call my-dir)\n')
+    f.write('include $(CLEAR_VARS)\n\n')
 
     makefile_writer.write_local_vars(f, var_dict, False, None)
 
     f.write(SKIA_RESOURCES)
+    f.write('include $(LOCAL_PATH)/../skia_static_deps.mk\n')
     f.write('include $(BUILD_NATIVE_TEST)\n')