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

Merge commit '808380c0917481886203e4c8c2c2177487ca3441' into dalvik-dev

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