Merge "Revert "Add NTFS support in vold""