Merge "Ensure dexopt is executed only with consistent package data" am: 1ad0304e7d am: 1c6eeaec1b  -s ours
am: eb68bfac36  -s ours

Change-Id: I60228e1bb6b2a3fbeecb0c423604aaabf5833501