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