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

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

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



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