Merge "Add "default_normal" support to vold."