Merge "Add otapreopt logic for CompactDex version bump"