Merge "vold: set klog level so e2fsck output is logged" into jb-mr2-dev