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

Change-Id: I506470013e57b288d54eb5bc308eb79c7c224e69