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

Change-Id: I54f6eea644b392f6aefa9c07e035a1e2478ba311