Remove unused references to ISurface

Change-Id: I542806b5c91c525ed7cde821f6963f1e020ddf1a
3 files changed