Merge "Move vold to libc++."