Merge "Testrunner: Fix --gdb issue" am: a749ec2827 am: 9123cfb35c
am: 6c97c0487f

Change-Id: I285844802a200560b2337a3724c2329de507dd2e