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

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



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