Merge "Revert "Don't disable dexpreopt for an unbundled build."" am: 9964bf51 am: ae604558

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



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