Android GN: Include libstdc++.so when doing a component build

build/android/gyp/write_ordered_libraries.py

Index: build/android/gyp/write_ordered_libraries.py
diff --git a/build/android/gyp/write_ordered_libraries.py b/build/android/gyp/write_ordered_libraries.py
index 67e7805cd2bdda847d0da350266bbc6e64a12ac1..0fc9a8ca3ef2de04b7283362603ed4556d94c354 100755
--- a/build/android/gyp/write_ordered_libraries.py
+++ b/build/android/gyp/write_ordered_libraries.py
@@ -73,7 +73,7 @@ def GetDependencies(library_or_executable):
 
 
 def GetNonSystemDependencies(library_name):
-  all_deps = GetDependencies(FullLibraryPath(library_name))
+  all_deps = GetDependencies(library_name)
   return set((lib for lib in all_deps if not IsSystemLibrary(lib)))
 
 
@@ -119,8 +119,13 @@ def main():
   java_libraries_list = (
       '{%s}' % ','.join(['"%s"' % s[3:-3] for s in libraries]))
 
+  out_json = {
+      'libraries': libraries,
+      'lib_paths': [FullLibraryPath(l) for l in libraries],
+      'java_libraries_list': java_libraries_list
+      }
   build_utils.WriteJson(
-      {'libraries': libraries, 'java_libraries_list': java_libraries_list},
+      out_json,
       options.output,
       only_if_changed=True)