Merge "Resolve gdbclient.py -r executable from target"
am: f45395cec0

Change-Id: I7f38016c99f748f4641cedbbaa045a547db7f8f4