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

Change-Id: I0b8dd98348680793cf10721cf7dfb19c3e100f84