am 6b4e9ebc: am a0c98ef0: Ensure -user builds can run the dex preopt pass in the emulator.

Merge commit '6b4e9ebc4cab1dab3b8769a27868addd202a29b5'

* commit '6b4e9ebc4cab1dab3b8769a27868addd202a29b5':
  Ensure -user builds can run the dex preopt pass in the emulator.