Merge "vold: allow wakelocks, fsck logs"