Merge "For user and userdebug generate error if DEXPREOPT is not enabled" am: afc270b066
am: 6a3744ba11  -s ours

Change-Id: I7fe4749e2af8f63eeff4fb9aac779210816fbd1e