Merge "Always unlink the out_vdex_file." am: fbb09a7192
am: e5a1bc620b

Change-Id: Ib4ecf1c85ec826edee1de3cd11e565d0ecaf7114