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

Change-Id: Ifca15e95a8876ea5da516c798e972c534367e582