Merge "Collect stack traces from vold in bugreports"
am: 97b636e069

Change-Id: I1ca365f8f1fb2d43a92b98593c119ede5b117244