Merge change Id23b791a into eclair

* changes:
  fix [2170283] SurfaceFlinger crashes on OOM.