Merge "vold: explicitly specify capabilities"