Merge change Ia8ac904d into eclair

* changes:
  fix [2182249] [MR1] valgrind error in surface flinger