Merge "Always unlink the out_vdex_file." into oc-dev am: 6949ec68e7
am: e844c19f94

Change-Id: I5b9afd5b4b75e2893a75c7277fcd631829b5e4ff