Replace direct SkSurface creation with canvas->makeSurface

This is causing Skia to need to define GPU-specific canvas
methods even when Android is being built without a GPU backend.

Change-Id: Ia2be81e15599d3c6984748edde8d7ec97be9eb7a