Merge "Remove DEXOPT_OTA flag." am: 8584db972c
am: 3dae5ca9d6

Change-Id: I260245cc751aeea170e849f2520d1ab700ff503b