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

Change-Id: I16aff77b6c61082d2c1fc4b97a0893712705774b