Merge "Collect stack traces from vold in bugreports"