Merge "Use vold's mount with metadata encryption service."