Merge "Delete vdex file in delete_odex." am: 99dedeb690 am: f6b79dd073 am: 6dc664460d
am: 362e56e41a

Change-Id: I7594ff3af6fc72e4d155afab41ef3ae4cb1b60ef