am baa78bce: am bdfa9937: Merge change 25979 into eclair

Merge commit 'baa78bce6683560b4f9dca3b71e33d90d2d0cf29'

* commit 'baa78bce6683560b4f9dca3b71e33d90d2d0cf29':
  Allow dalvik pre-optimization to run in ARMv7 emulator.