Merge "Fix build break caused by vold change"