Make wait_for print out command on timeout.

We use it in some places in succession without expected output between,
so it is hard to know what is timing out.

Change-Id: Ie6eb30ef494a1aa246428f95ff0c1d45e204ff75
Merge "Make wait_for print out command on timeout."