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

Change-Id: I9b6b0b3fecb25e01b10d126e9d236658acd1e99c