am 7bb7e992: Merge change Ia8ac904d into eclair

Merge commit '7bb7e99216956d917af1786a3e02a92cac46fc84' into eclair-plus-aosp

* commit '7bb7e99216956d917af1786a3e02a92cac46fc84':
  fix [2182249] [MR1] valgrind error in surface flinger
tree: b5b8f017ca5ec29b994338f28990dcd7b2c2b88b
  1. cmds/
  2. include/
  3. media/