Merge "Fix problem with wait_for_gdb." am: d494665822
am: 9c02f2379f

* commit '9c02f2379f8cfb110fb1e4c17ce6cc616dc3d729':
  Fix problem with wait_for_gdb.

Change-Id: I9aefa416eef99816f5a65f184d09751fc8973c8e