Merge "Fix reference to uncleared variable in dex_preopt_odex_install.mk" am:...

Merge "Fix reference to uncleared variable in dex_preopt_odex_install.mk" am: 05302dad am: 48ef312c am: fe70e5b7

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

Change-Id: I01d6fdf72d8d0d8be01d9976157f4ddef19a76ed