Merge "Ensure dexopt is executed only with consistent package data" into oc-mr1-dev
am: 5ba8e3dc78

Change-Id: I1236a8f4bc1a11abde32e9462aefcba6d88e1854