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

Change-Id: I3b2e5e2cad71a8afb340334bce329bc239c10387