Merge "Always unlink the out_vdex_file." into oc-dev