diff --git a/python-packages/gdbrunner/__init__.py b/python-packages/gdbrunner/__init__.py
index 0f13e158c..f399d732f 100644
--- a/python-packages/gdbrunner/__init__.py
+++ b/python-packages/gdbrunner/__init__.py
@@ -362,16 +362,8 @@ def start_gdb(gdb_path, gdb_commands, gdb_flags=None, lldb=False):
     creationflags = 0
     if sys.platform.startswith("win"):
         creationflags = subprocess.CREATE_NEW_CONSOLE
-    env = dict(os.environ)
-    if lldb:
-        bin_dir = os.path.dirname(gdb_path)
-        if sys.platform.startswith("win"):
-            python_path = os.path.join(bin_dir, "../lib/site-packages")
-        else:
-            python_path = os.path.join(bin_dir, "../lib/python2.7/site-packages")
-        env['PYTHONPATH'] = os.path.normpath(python_path)
 
-    gdb_process = subprocess.Popen(gdb_args, creationflags=creationflags, env=env)
+    gdb_process = subprocess.Popen(gdb_args, creationflags=creationflags)
     while gdb_process.returncode is None:
         try:
             gdb_process.communicate()
diff --git a/scripts/gdbclient.py b/scripts/gdbclient.py
index 65f21d718..f78ef2b9a 100755
--- a/scripts/gdbclient.py
+++ b/scripts/gdbclient.py
@@ -337,12 +337,13 @@ end
     return gdb_commands
 
 
-def generate_lldb_script(sysroot, binary_name, port, solib_search_path):
+def generate_lldb_script(root, sysroot, binary_name, port, solib_search_path):
     commands = []
     commands.append(
         'settings append target.exec-search-paths {}'.format(' '.join(solib_search_path)))
 
     commands.append('target create {}'.format(binary_name))
+    commands.append("settings set target.source-map '' '{}'".format(root))
     commands.append('target modules search-paths add / {}/'.format(sysroot))
     commands.append('gdb-remote {}'.format(port))
     return '\n'.join(commands)
@@ -376,7 +377,7 @@ def generate_setup_script(debugger_path, sysroot, linker_search_dir, binary_file
         return generate_gdb_script(root, sysroot, binary_file.name, port, dalvik_gdb_script, solib_search_path, connect_timeout)
     elif debugger == 'lldb':
         return generate_lldb_script(
-            sysroot, binary_file.name, port, solib_search_path)
+            root, sysroot, binary_file.name, port, solib_search_path)
     else:
         raise Exception("Unknown debugger type " + debugger)