Merge "Don't disable dexpreopt for an unbundled build." am: 0a3f6a2b

Original change: https://android-review.googlesource.com/c/platform/build/+/2425454



Change-Id: Ib352612a51574c623334cd670d7762125469fe90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>