don't use default names with libvintf. am: d2335a8e2a am: c7b13fee20
am: b8452f7a8f

Change-Id: I6a9502086b23ba1216e2149da4e0668b6a0169a7