Merge change 24642 into eclair

* changes:
  make sure conditions will return when the status of a surface is not NO_ERROR
tree: 7c9dcc6b9c32fa1c0c348d69a4fa9e3e75c15db3
  1. cmds/
  2. include/
  3. media/