Merge "crasher: add option to wait for input before crashing." am: 84db3f19bc am: e1a06eef2a
am: 64ef152173

Change-Id: I93cad11b4ff1b1264ed5ef34731072580d807bae