Merge "Adjust forced dexopt in case of stripped APKs." into oc-dev