Merge "Revert "Disable in-place vdex update""
am: 52ca987db6

Change-Id: Id4060442d160fb91b8245388c1a45f442ac20a89