Merge "Turn off tracing around pid/chroot check"

lib/common-functions

@@ -135,6 +135,10 @@ function eval_run_d () {
 }
 
 function kill_chroot_processes () {
+    local xtrace
+    xtrace=$(set +o | grep xtrace)
+    set +o xtrace
+
     if [ -z "${1}" ]; then
         echo "ERROR: no chroot directory specified"
         exit 1
@@ -149,6 +153,8 @@ function kill_chroot_processes () {
             sudo kill $pid
         fi
     done
+
+    $xtrace
 }
 
 function cleanup_build_dir () {