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

Change-Id: I5adb5d7bc53d01e08675a5c05387546ae78763c9