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

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



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