Merge "servicemanager: check VINTF manifest for VINTF ifs" am: de1ca5a324
am: 910206c397

Change-Id: I630cc325adbe31e078d197367bde6e9f7a6ef07c