Cherrypick vold patch to allow switching storages