Merge "Add otapreopt logic for CompactDex version bump"
am: 1812ea7c47

Change-Id: I2718121c5634d908123647a8907b1dfc28d11096