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

Change-Id: I28ec2908c795bf3e88960732d69e2945b1eac422