am 4b227c70: am f9f83ed1: Merge "emulator: Enable dex-preoptimization"

* commit '4b227c708c1014bd773085ae275275744f239435':
  emulator: Enable dex-preoptimization