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

Change-Id: Ia62371b43501d4e9c774baf1f563a587bff45c75