Merge "servicemanager: check VINTF manifest for VINTF ifs"