Merge "Add support for using gdbserver with run-test" am: 29e970e7a4 am: 17ba4ee5ab
am: 401f6b71e9

Change-Id: I350494ce8927bd270a75a6bdd93357497cc6eb41