Merge "Delete vdex file in delete_odex."
am: 99dedeb690

Change-Id: Idccc7fa241cdbb72b0ac5672978350a269ac8378