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

Change-Id: If308f224da89d87183a262a782902e4cc8233af8