Merge "Disable in-place vdex update" am: d9917d78a0 am: 2521871a1f
am: b8e9326fd8

Change-Id: Ia2297f8cc31830e4e3909580f3af45dfb96e5901