am 0bf9cdf5: am a9046e41: Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."

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

* commit '0bf9cdf569c9e34704e5dad6e858aa8cb8f6a5bb':
  Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."