Merge "Revert "Disable in-place vdex update""