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

Change-Id: I22cd4f72ec630f0981b9106291639c3f5b9b5bc7