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

Change-Id: I7722af5c9fee1947c86c404239014d3dd500b80a