Do not assume default names for VINTF. am: df3c680b5f
am: a953597edb

Change-Id: Ice5168beab9e414e278454eb310fdf9095d7532d