Merge "Fix problem with wait_for_gdb." am: d494665822 am: 9c02f2379f am: 190786fff2
am: 939b400b26

* commit '939b400b2619009197788ebcefa0342c6913d8a3':
  Fix problem with wait_for_gdb.

Change-Id: Idf3295ddc7a087d0f5a59dad6dd61ff33dce77da