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

Change-Id: I8e0485503d179d189719ce419f8b409325e06e88