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

Change-Id: I248a7631e60220f448c21b3346d51e8c5c385398