Merge "Remove DEXOPT_OTA flag."
am: 8584db972c

Change-Id: I706f3d92b15f169f0ec877e95bac224bb90c2033