Merge change 25979 into eclair

* changes:
  Allow dalvik pre-optimization to run in ARMv7 emulator.