Merge "Ensure dexopt is executed only with consistent package data"
am: 1ad0304e7d

Change-Id: I32a9c3cf57d0726d7959eb331530fab7f79a7619