Do not assume default names for VINTF.
am: df3c680b5f

Change-Id: Ic57f60a7e0734e98d2c0822b0da30fe6d079f8b4