Merge "Remove broken secondary dexopt during OTA" into oc-mr1-dev