Merge "servicemanager: preload vintf manifest"