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

Merge commit '2c97ad648c27d81ba3e5d1c209d2d7efab7a7b5d'

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