Merge "Debuggerd: Extend crash_dump timeout to 5 seconds" am: b2bf7a5330
am: 21ca4e5d4a

Change-Id: I2b178cfb2d44bafa0759c1aa2fd510e93b39959a