Revert of Move from libstlport to libc++ for Android framework builds

platform_tools/android/gyp_gen/makefile_writer.py

Index: platform_tools/android/gyp_gen/makefile_writer.py
diff --git a/platform_tools/android/gyp_gen/makefile_writer.py b/platform_tools/android/gyp_gen/makefile_writer.py
index 0105e1dc576989e89baf7f972b4a63bc4206b7f2..d8d0c6196fe70e6ad1f751076ed8f9691ea70334 100644
--- a/platform_tools/android/gyp_gen/makefile_writer.py
+++ b/platform_tools/android/gyp_gen/makefile_writer.py
@@ -161,6 +161,14 @@
   """
   f.write('include $(CLEAR_VARS)\n')
 
+def write_include_stlport(f):
+  """Add a line to include stlport.
+
+  Args:
+    f: File open for writing.
+  """
+  f.write('include external/stlport/libstlport.mk\n')
+
 def write_android_mk(target_dir, common, deviations_from_common):
   """Given all the variables, write the final make file.
 
@@ -225,6 +233,7 @@
       if data.condition:
         f.write('endif\n\n')
 
+    write_include_stlport(f)
     f.write('include $(BUILD_SHARED_LIBRARY)\n')
     f.write(SKIA_TOOLS)