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

Change-Id: I194665350fb6416acc1158fdfc125d6867cbf588