Merge "Collect watchdog stacks from vold."