Merge commit 'fe50b63f9b5b7e05754e3fba3ccce69b710dbafe' into eclair-mr2-plus-aosp * commit 'fe50b63f9b5b7e05754e3fba3ccce69b710dbafe': fix [2182249] [MR1] valgrind error in surface flinger
Merge commit 'fe50b63f9b5b7e05754e3fba3ccce69b710dbafe' into eclair-mr2-plus-aosp * commit 'fe50b63f9b5b7e05754e3fba3ccce69b710dbafe': fix [2182249] [MR1] valgrind error in surface flinger