am ad84fa33: am 4d9b822e: get rid of ISurface

* commit 'ad84fa334c5baec53b1607a23483f40907e964de':
  get rid of ISurface