Merge "Be defensive in dex2oat when updating the vdex in-place."
am: 8dc0329f93

Change-Id: I36dfb64ea41d53ec143417484b5549d3e7078708