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

Change-Id: Ic974c26f82366885196bf7b6b2e59971bd84a31d