am bdfa9937: Merge change 25979 into eclair

Merge commit 'bdfa9937a8fc8230ca109774ccc1eafaa20ba1a7' into eclair-plus-aosp

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