Merge "Use correct PackageSetting for dexopt calculation" into rvc-dev