Merge "vold now prepares a subdirectory for face data."