am 0c0d7d25: am 18e1486a: Remove surface from rs init and handle surfaceChanged correctly.

Merge commit '0c0d7d25fd7332e6562f99dae0ae823bc84bdfd5' into eclair-mr2-plus-aosp

* commit '0c0d7d25fd7332e6562f99dae0ae823bc84bdfd5':
  Remove surface from rs init and handle surfaceChanged correctly.