Merge "Fix gdbserver path in gdbclient.py" am: d328a9c301
am: 80db2e200a

Change-Id: I5d06211465fb147c149d8b30fedc98890b9e1647