Merge "gdbclient.py: Add --env flag." am: f91fb912d3
am: 466966c66a

Change-Id: I1166c85b4191ed8992cfd6ccbaa3aec41bc49eda