Merge "Allow system watchdog to collect traces from vold."