Merge "For user and userdebug generate error if DEXPREOPT is not enabled"
am: afc270b066

Change-Id: I0f1913673dc9732325b86ea0796295bc5967e1a1