Merge "Use the boot image mainline extension when dexpreopting in Make." am: 3a6ebaac

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



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