Add otapreopt logic for CompactDex version bump
am: a3a18bee9d  -s ours

Change-Id: I405bd13ab6d5d27a541365cdc8f0ba0723d3779b