am 10a1d761: am 20228de2: Flesh out dex-preopt a bit more.

Merge commit '10a1d7615652de5de0214265123044f032d45177'

* commit '10a1d7615652de5de0214265123044f032d45177':
  Flesh out dex-preopt a bit more.