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

Change-Id: I9c4d606bcb054ad96b28a4da76a7ddf241d8687b