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

Change-Id: I0116a003cd1985e15d2beb9a60a4262549647774