Merge "Revert "Revert "For user and userdebug generate error if DEXPREOPT is...
Merge "Revert "Revert "For user and userdebug generate error if DEXPREOPT is not enabled""" into pi-dev am: 1a50e975
am: 94b0a48c
Change-Id: I5cbcefc352e24013750d4cacf670c2dcf0140226