Merge change Id86beb99 into eclair

* changes:
  fix [2291418] Camera preview cannot work in Emulator