am 84fbc7e8: am 996f3826: am c5a56344: am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"

* commit '84fbc7e82a0a075c3cc8bb73baa9e6d87fd53aa4':
  Remove the redundant DISABLE_DEXPREOPT