diff --git a/android-configure b/android-configure
index 1dc238ebd0c522..3190b0b914e9da 100755
--- a/android-configure
+++ b/android-configure
@@ -51,9 +51,9 @@ export CC=$TOOLCHAIN/bin/$SUFFIX-gcc
 export CXX=$TOOLCHAIN/bin/$SUFFIX-g++
 export LINK=$TOOLCHAIN/bin/$SUFFIX-g++
 
-GYP_DEFINES="target_arch=$ARCH"
-GYP_DEFINES+=" v8_target_arch=$ARCH"
-GYP_DEFINES+=" android_target_arch=$ARCH"
+GYP_DEFINES="target_arch=$DEST_CPU"
+GYP_DEFINES+=" v8_target_arch=$DEST_CPU"
+GYP_DEFINES+=" android_target_arch=$DEST_CPU"
 GYP_DEFINES+=" host_os=linux OS=android"
 export GYP_DEFINES
 
diff --git a/lib/child_process.js b/lib/child_process.js
index 81fb8c1fcd0fe8..1541baf64660b6 100644
--- a/lib/child_process.js
+++ b/lib/child_process.js
@@ -484,7 +484,7 @@ function execFileSync(/*command, args, options*/) {
 
   var ret = spawnSync(opts.file, opts.args.slice(1), opts.options);
 
-  if (inheritStderr)
+  if (inheritStderr && ret.stderr)
     process.stderr.write(ret.stderr);
 
   var err = checkExecSyncError(ret);
@@ -504,7 +504,7 @@ function execSync(command /*, options*/) {
   var ret = spawnSync(opts.file, opts.options);
   ret.cmd = command;
 
-  if (inheritStderr)
+  if (inheritStderr && ret.stderr)
     process.stderr.write(ret.stderr);
 
   var err = checkExecSyncError(ret);