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

Change-Id: I2e9bf76d52567191bdceccbadc95defbb7a0fd0f