Merge "Disable in-place vdex update"
am: d9917d78a0

Change-Id: Ieb4a1235dc99cac32b6fb441ee98e0cbdf4b7661