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

Change-Id: I7ca8d02b2e43ae1a2d69aeb0551f7297f6da83ee