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

Change-Id: Ia43b97c1fd55ac6f9bd9b748bb6f08c55097d84f