am c7141303: Merge change Id23b791a into eclair

Merge commit 'c71413032e1ad1f166861a980d8547d4106f7fa0' into eclair-mr2

* commit 'c71413032e1ad1f166861a980d8547d4106f7fa0':
  fix [2170283] SurfaceFlinger crashes on OOM.