Merge "Debuggerd: Extend crash_dump timeout to 5 seconds" am: b2bf7a5330 am: 21ca4e5d4a am: 7dfcc376f7
am: 11c8647ecd

Change-Id: I904d85dd273d20288073b792c22dd6b6ebb7772d