Merge "Remove broken secondary dexopt during OTA"