Merge "Revert "Disable in-place vdex update"" into oc-dev
am: 7258088ea5

Change-Id: I3e36f53541ccac1cccd2361d4d6b752e8e881668