Merge "Add NTFS support in vold"