Merge "Be defensive in dex2oat when updating the vdex in-place." into oc-dev