am f1f05d30: Merge "Really fix --gdb when running tests on target."

* commit 'f1f05d303988a5c071c87b760056be8358276c94':
  Really fix --gdb when running tests on target.