Merge "vold: allow specifying HEH filenames encryption"