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

* commit '996f3826f7005cf207c8565f674ee38df1ada153':
  Remove the redundant DISABLE_DEXPREOPT