Merge "Always unlink the out_vdex_file."
am: fbb09a7192

Change-Id: If1eed0f380172f05b4fbd7a8f853a9d7db6f4aa7