Merge "Keep track of primary dexopt"