Merge "Always unlink the out_vdex_file." am: fbb09a7192 am: e5a1bc620b am: 2087818222
am: 0bc052e9bc

Change-Id: I3a7aaffbc0d4d7314a3765e9b9bfe02c438e3e29