Merge "Ensure the  oat/vdex file is erased if we fail to truncate"
am: 2dc2bcc09a

Change-Id: I30fe2c1aa257e5d58598ff786a28046b825c1402