Merge "Do not set DISABLE_PREOPT_BOOT_IMAGES when doing a VSDK build."

DISABLE_PREOPT_BOOT_IMAGES :=

ifneq (,$(TARGET_BUILD_APPS)$(TARGET_BUILD_UNBUNDLED_IMAGE))

  DISABLE_PREOPT := true

  # VSDK builds perform dexpreopt during merge_target_files build step.

  ifneq (true,$(BUILDING_WITH_VSDK))

    DISABLE_PREOPT_BOOT_IMAGES := true

  endif

endif

ifeq (true,$(TARGET_BUILD_UNBUNDLED))

  ifneq (true,$(UNBUNDLED_BUILD_SDKS_FROM_SOURCE))

    TARGET_BUILD_USE_PREBUILT_SDKS := true