Merge "Otapreopt: Check dexopt return status before retry" into oc-dev