Mishandled create_vdex_filename. bug:30937355 This reverts commit 196539e9. Change-Id: Idd1a9f9567240899a103547a36dd036219f303cd