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

Change-Id: Iab9661cb66924b200263acaac4ce4f2876481a52