am 806a5160: am 4c5d26bc: Make the app processing variant of dex-preopt more consistent.

Merge commit '806a516031e6ff716891d9e471e13ee27ca0c2fe'

* commit '806a516031e6ff716891d9e471e13ee27ca0c2fe':
  Make the app processing variant of dex-preopt more consistent.