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: I490a6fc01851a809b90b7e98e220ff5a340fc4df