Merge "Use correct PackageSetting for dexopt calculation" into rvc-dev am: d012f7be am: dc18d9df Change-Id: I3551c45fcd661b74de981a6e2220cc7c626b86c1