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

Change-Id: I4623143084031074f01f87e71f82ec5d63a8e066