Merge "Track package manager changes for arch specific dexopt."