diff --git a/gyp/pylib/gyp/generator/android.py b/gyp/pylib/gyp/generator/android.py
index bb9eb5f4b9..5b26cc785a 100644
--- a/gyp/pylib/gyp/generator/android.py
+++ b/gyp/pylib/gyp/generator/android.py
@@ -875,6 +875,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, part_of_all,
       self.WriteLn('LOCAL_PRELINK_MODULE := false')
       self.WriteLn('include $(BUILD_%sSHARED_LIBRARY)' % modifier)
     elif self.type == 'executable':
+      self.WriteLn('LOCAL_CXX_STL := libc++_static')
       # Executables are for build and test purposes only, so they're installed
       # to a directory that doesn't get included in the system image.
       self.WriteLn('LOCAL_MODULE_PATH := $(gyp_shared_intermediate_dir)')
@@ -1080,7 +1081,7 @@ def CalculateMakefilePath(build_file, base_name):
   root_makefile.write('GYP_CONFIGURATION ?= %s\n' % default_configuration)
   root_makefile.write('GYP_VAR_PREFIX ?=\n')
   root_makefile.write('GYP_HOST_VAR_PREFIX ?=\n')
-  root_makefile.write('GYP_HOST_MULTILIB ?=\n')
+  root_makefile.write('GYP_HOST_MULTILIB ?= first\n')
 
   # Write out the sorted list of includes.
   root_makefile.write('\n')