Merge "servicemanager: vintf declared API"